undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/virtual-objects-do-exist'

Browse Source 
A recent update broke "is this object available to us?" check for
well-known objects like an empty tree (which should yield "yes",
even when there is no on-disk object for an empty tree), which has
been corrected.

* jk/virtual-objects-do-exist:
  rev-list: allow cached objects in existence check
This commit is contained in:
Junio C Hamano 2019-03-20 15:16:07 +09:00
commit 83b13e284c
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/rev-list.c
View File

@ -238,7 +238,7 @@ static inline void finish_object__ma(struct object *obj)
static int finish_object(struct object *obj, const char *name, void *cb_data) static int finish_object(struct object *obj, const char *name, void *cb_data)
{ {
struct rev_list_info *info = cb_data; struct rev_list_info *info = cb_data;
if (!has_object_file(&obj->oid)) { if (oid_object_info_extended(the_repository, &obj->oid, NULL, 0) < 0) {
finish_object__ma(obj); finish_object__ma(obj);
return 1; return 1;
} }

10
t/t1060-object-corruption.sh
View File

@ -127,4 +127,14 @@ test_expect_success 'fetch into corrupted repo with index-pack' '
) )
' '
test_expect_success 'internal tree objects are not "missing"' '
git init missing-empty &&
(
cd missing-empty &&
empty_tree=$(git hash-object -t tree /dev/null) &&
commit=$(echo foo | git commit-tree $empty_tree) &&
git rev-list --objects $commit
)
'
test_done test_done