зеркало из https://github.com/microsoft/git.git
Merge branch 'sb/sha1-loose-object-info-check-existence' into maint
"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:
Коммит
66c24cd8a4
15
sha1_file.c
15
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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче