diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-05 20:32:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-05 20:32:57 (GMT) |
| commit | 00b7cf2379901394c971db5ab59ce70e12e434b7 (patch) | |
| tree | 8faa0060f04463c5ee526b5db5e0240a272bf679 /builtin/index-pack.c | |
| parent | 8e90578ffbce029a09c2a56e95ba3009f27e4937 (diff) | |
| parent | e83e71c5e15f2c6aaf9bdb8ee9593a46c3bb9a5b (diff) | |
| download | git-00b7cf2379901394c971db5ab59ce70e12e434b7.zip git-00b7cf2379901394c971db5ab59ce70e12e434b7.tar.gz git-00b7cf2379901394c971db5ab59ce70e12e434b7.tar.bz2 | |
Merge branch 'jt/unify-object-info'
Code clean-ups.
* jt/unify-object-info:
sha1_file: refactor has_sha1_file_with_flags
sha1_file: do not access pack if unneeded
sha1_file: teach sha1_object_info_extended more flags
sha1_file: refactor read_object
sha1_file: move delta base cache code up
sha1_file: rename LOOKUP_REPLACE_OBJECT
sha1_file: rename LOOKUP_UNKNOWN_OBJECT
sha1_file: teach packed_object_info about typename
Diffstat (limited to 'builtin/index-pack.c')
| -rw-r--r-- | builtin/index-pack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index ad4de35..26828c1 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -793,7 +793,8 @@ static void sha1_object(const void *data, struct object_entry *obj_entry, if (startup_info->have_repository) { read_lock(); - collision_test_needed = has_sha1_file_with_flags(oid->hash, HAS_SHA1_QUICK); + collision_test_needed = + has_sha1_file_with_flags(oid->hash, OBJECT_INFO_QUICK); read_unlock(); } |