diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-12-05 13:00:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-05 13:00:12 -0800 |
| commit | c17fa972d30f56908bed21df79b364ade04fbd20 (patch) | |
| tree | 3ebbe1e356e49d6ec2df0dcf580e13a7465bc26d | |
| parent | Merge branch 'jk/two-way-merge-corner-case-fix' (diff) | |
| parent | sha1_loose_object_info(): do not return success on missing object (diff) | |
| download | tgif-c17fa972d30f56908bed21df79b364ade04fbd20.tar.xz | |
Merge branch 'sb/sha1-loose-object-info-check-existence'
"git cat-file --batch-check=ok" did not check the existence of the
named object.
* sb/sha1-loose-object-info-check-existence:
sha1_loose_object_info(): do not return success on missing object
| -rw-r--r-- | sha1_file.c | 15 | ||||
| -rwxr-xr-x | t/t1006-cat-file.sh | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/sha1_file.c b/sha1_file.c index 5f15223586..760dd60031 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2483,15 +2483,18 @@ 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) { - 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; } diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh index a420742494..8a1bc5c532 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 |