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

gitster · gitster · commit 83b13e284ce3 · 2019-03-20T15:16:07.000+09:00
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
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
@@ -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)
 {
 	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);
 		return 1;
 	}
diff --git a/t/t1060-object-corruption.sh b/t/t1060-object-corruption.sh
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ static inline void finish_object__ma(struct object *obj)`
`238`	`238`	`static int finish_object(struct object obj, const char name, void *cb_data)`
`239`	`239`	`{`
`240`	`240`	`struct rev_list_info *info = cb_data;`
`241`		`- if (!has_object_file(&obj->oid)) {`
	`241`	`+ if (oid_object_info_extended(the_repository, &obj->oid, NULL, 0) < 0) {`
`242`	`242`	`finish_object__ma(obj);`
`243`	`243`	`return 1;`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,4 +127,14 @@ test_expect_success 'fetch into corrupted repo with index-pack' '`
`127`	`127`	`)`
`128`	`128`	`'`
`129`	`129`
	`130`	`+test_expect_success 'internal tree objects are not "missing"' '`
	`131`	`+ git init missing-empty &&`
	`132`	`+ (`
	`133`	`+ cd missing-empty &&`
	`134`	`+ empty_tree=$(git hash-object -t tree /dev/null) &&`
	`135`	`+ commit=$(echo foo \| git commit-tree $empty_tree) &&`
	`136`	`+ git rev-list --objects $commit`
	`137`	`+ )`
	`138`	`+'`
	`139`	`+`
`130`	`140`	`test_done`