diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-06-02 12:18:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-06-02 12:18:51 -0700 |
| commit | 17c2929aa2ed999cbefa75ca5e933e1bf53a95bf (patch) | |
| tree | ae29ccac1e4fd717567db0f1dbabebeee3046d6c /builtin-fsck.c | |
| parent | 9b07873a52cc0243c2eddfac2e9c514152b96fb7 (diff) | |
| parent | bc8e478a285ff549a3e5182461b064313d400de3 (diff) | |
| download | git-17c2929aa2ed999cbefa75ca5e933e1bf53a95bf.tar.gz | |
Merge branch 'sp/pack'
* sp/pack:
Style nit - don't put space after function names
Ensure the pack index is opened before access
Simplify index access condition in count-objects, pack-redundant
Test for recent rev-parse $abbrev_sha1 regression
rev-parse: Identify short sha1 sums correctly.
Attempt to delay prepare_alt_odb during get_sha1
Micro-optimize prepare_alt_odb
Lazily open pack index files on demand
Diffstat (limited to 'builtin-fsck.c')
| -rw-r--r-- | builtin-fsck.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin-fsck.c b/builtin-fsck.c index cbbcaf011a..9959818ced 100644 --- a/builtin-fsck.c +++ b/builtin-fsck.c @@ -668,7 +668,10 @@ int cmd_fsck(int argc, char **argv, const char *prefix) verify_pack(p, 0); for (p = packed_git; p; p = p->next) { - uint32_t i, num = p->num_objects; + uint32_t i, num; + if (open_pack_index(p)) + continue; + num = p->num_objects; for (i = 0; i < num; i++) fsck_sha1(nth_packed_object_sha1(p, i)); } |