diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-08-13 14:13:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-13 14:13:39 -0700 |
| commit | d1a8a8979d61a889b915dca36aea9c2a88d0f3f7 (patch) | |
| tree | 02eece403714ca30f78b50c485e323db0ab44b97 /builtin/fsck.c | |
| parent | Merge branch 'bc/sha-256-cvs-svn-updates' (diff) | |
| parent | fsck: do not lazy fetch known non-promisor object (diff) | |
| download | tgif-d1a8a8979d61a889b915dca36aea9c2a88d0f3f7.tar.xz | |
Merge branch 'jt/has_object'
A new helper function has_object() has been introduced to make it
easier to mark object existence checks that do and don't want to
trigger lazy fetches, and a few such checks are converted using it.
* jt/has_object:
fsck: do not lazy fetch known non-promisor object
pack-objects: no fetch when allow-{any,promisor}
apply: do not lazy fetch when applying binary
sha1-file: introduce no-lazy-fetch has_object()
Diffstat (limited to 'builtin/fsck.c')
| -rw-r--r-- | builtin/fsck.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 37aa07da78..fbf26cafcf 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -168,7 +168,7 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt return 0; if (!(obj->flags & HAS_OBJ)) { - if (parent && !has_object_file(&obj->oid)) { + if (parent && !has_object(the_repository, &obj->oid, 1)) { printf_ln(_("broken link from %7s %s\n" " to %7s %s"), printable_type(&parent->oid, parent->type), |