mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/sha1-loose-object-info-check-existence'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2013-12-05 13:00:11 -08:00
parent 3979580265 4ef8d1dd03
commit c17fa972d3
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sha1_file.c
View File

@ -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;
}