diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2017-06-21 17:40:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-26 10:28:58 -0700 |
| commit | e83e71c5e15f2c6aaf9bdb8ee9593a46c3bb9a5b (patch) | |
| tree | 933f4dd4f8205411367bc2f24208a1a632fd2267 /builtin/index-pack.c | |
| parent | cd585e2a33841d725b821adbb9b48654fc7d0b61 (diff) | |
| download | git-e83e71c5e15f2c6aaf9bdb8ee9593a46c3bb9a5b.tar.gz | |
sha1_file: refactor has_sha1_file_with_flagsjt/unify-object-info
has_sha1_file_with_flags() implements many mechanisms in common with
sha1_object_info_extended(). Make has_sha1_file_with_flags() a
convenience function for sha1_object_info_extended() instead.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 04b9dcaf0f..587bc80c96 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -794,7 +794,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(); } |