diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-20 09:16:07 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-20 09:16:07 +0300 |
| commit | 83b13e284ce3e349aedfc48fc0fb885c390bb18b (patch) | |
| tree | 936dc66007bd7ae0c9a2c34ca66e190fa4305952 /builtin/rev-list.c | |
| parent | 27cdbdd134f181fc97f9589039ed7c0d12759b5a (diff) | |
| parent | f06ab027efd2cff4c4319354f1ad7d5f09e853a1 (diff) | |
Merge branch 'jk/virtual-objects-do-exist'
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
Diffstat (limited to 'builtin/rev-list.c')
| -rw-r--r-- | builtin/rev-list.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 5b5b6dbb1c..425a5774db 100644 --- 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; } |