diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-11 20:49:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-11 20:49:56 (GMT) |
| commit | aec813062b340e6bb181470cf57cc4b4406e1bb8 (patch) | |
| tree | bb2b33ca6b89fdfd8d0e4b2e6d34f5a806674b67 /builtin-fsck.c | |
| parent | 8f4cc7911955a3642af601394a4b4473e7bfde33 (diff) | |
| parent | 69e020ae00ebd3f7ae3c2f35acb139361417ef64 (diff) | |
| download | git-aec813062b340e6bb181470cf57cc4b4406e1bb8.zip git-aec813062b340e6bb181470cf57cc4b4406e1bb8.tar.gz git-aec813062b340e6bb181470cf57cc4b4406e1bb8.tar.bz2 | |
Merge branch 'jc/maint-1.6.0-keep-pack'
* jc/maint-1.6.0-keep-pack:
is_kept_pack(): final clean-up
Simplify is_kept_pack()
Consolidate ignore_packed logic more
has_sha1_kept_pack(): take "struct rev_info"
has_sha1_pack(): refactor "pretend these packs do not exist" interface
git-repack: resist stray environment variable
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 64dffa5..6436bc2 100644 --- a/builtin-fsck.c +++ b/builtin-fsck.c @@ -160,7 +160,7 @@ static void check_reachable_object(struct object *obj) * do a full fsck */ if (!obj->parsed) { - if (has_sha1_pack(obj->sha1, NULL)) + if (has_sha1_pack(obj->sha1)) return; /* it is in pack - forget about it */ printf("missing %s %s\n", typename(obj->type), sha1_to_hex(obj->sha1)); errors_found |= ERROR_REACHABLE; |