On Wed, Nov 06, 2013 at 10:00:57AM -0800, Junio C Hamano wrote:
> I think the real problem is that sha1_loose_object_info() is called
> by sha1_object_info_extended(), when it does not find a cached or a
> packed object, and the callee assumes that it is asked to fill in
> only the requested pieces of information while the caller does not
> even bother to check if such an object actually exists.
Yes, exactly. This is over-optimization on the part of my 052fe5ea. The
caller asked for "nothing", so we happily optimize the request to do
nothing. But I forgot there is always an implicit "does it even exist"
query in the call. I do not see any point in adding an "exists" query
field to "struct object_info". :)
> -- >8 --
> Subject: sha1_loose_object_info(): do not return success on missing object
>
> Since 052fe5ea (sha1_loose_object_info: make type lookup optional,
> 2013-07-12), sha1_loose_object_info() returns happily without
> checking if the object in question exists, which is not what the the
> caller sha1_object_info_extended() expects; the caller does not even
> bother checking the existence of the object itself.
>
> Noticed-by: Sven Brauch <svenbrauch@xxxxxxxxxxxxxx>
> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
This is definitely the right fix. Commit message and patch look good to
me. A few extra bits are in the patch below.
> Oh, by the way, there is this one iffy bit in batch_one_object():
>
> if (get_sha1(obj_name, data->sha1)) {
> printf("%s missing\n", obj_name);
> fflush(stdout);
> return 0;
> }
>
> At this point, the object _may_ be missing, but the obj_name may be
> malformed, so saying "missing" is not strictly correct. If, for
> example, you misspelled the name of the master branch, you would get
> this:
>
> $ echo mastre | git cat-file --batch-check=foo
> mastre missing
>
> I however doubt that it is a good idea to reword this message by
> adding a logic to tell misspelled object name and missing object
> name apart. The users of "cat-file --batch-check" are not
> expecting to be able to distinguish these two classes of errors
> anyway.
Yes, I noticed that while doing the original series, but left it intact
for the exact reason you mention. Note that it is going to stdout and is
part of the actual data stream (so there is a good chance scripts are
parsing it).
> diff --git a/sha1_file.c b/sha1_file.c
> index 7dadd04..00220a4 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -2486,12 +2486,11 @@ static int sha1_loose_object_info(const unsigned char *sha1,
> * need to look inside the object at all.
> */
> if (!oi->typep && !oi->sizep) {
> - if (oi->disk_sizep) {
> - struct stat st;
> - if (stat_sha1_file(sha1, &st) < 0)
> - return -1;
> + struct stat st;
> + if (stat_sha1_file(sha1, &st) < 0)
> + return -1;
> + if (oi->disk_sizep)
> *oi->disk_sizep = st.st_size;
> - }
> return 0;
Here's a squashable patch which expands the comment above the code
you're tweaking, and adds a test to t1006.
I notice that t1006 could use some modernization, whitespace-fixing, and
typo-fixing, but I left that out of the patch for clarity.
Thanks both of you for working on this.
-Peff
---
diff --git a/sha1_file.c b/sha1_file.c
index 3474dca..10676ba 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2489,7 +2489,11 @@ static int sha1_loose_object_info(const unsigned char *sha1,
/*
* If we don't care about type or size, then we don't
- * need to look inside the object at all.
+ * need to look inside the object at all. Note that we
+ * do not optimize out the stat call, even if the
+ * caller doesn't care about the disk-size, since our
+ * return value implicitly indicates whether the
+ * object even exists.
*/
if (!oi->typep && !oi->sizep) {
struct stat st;
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index a420742..8a1bc5c 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -194,6 +194,12 @@ test_expect_success "--batch-check for an emtpy line" '
test " missing" = "$(echo | git cat-file --batch-check)"
'
+test_expect_success 'empty --batch-check notices missing object' '
+ echo "$_z40 missing" >expect &&
+ echo "$_z40" | git cat-file --batch-check="" >actual &&
+ test_cmp expect actual
+'
+
batch_input="$hello_sha1
$commit_sha1
$tag_sha1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html