diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:27 (GMT) |
| commit | cba595ab1a7764aecfde2e8e59994f89b2cd2f2e (patch) | |
| tree | 832b23d5963d8931796fc3b9951e3708d1a40207 /builtin/index-pack.c | |
| parent | 96e6547c2e4c137222c01582b52c0c974a02fd63 (diff) | |
| parent | 01f8d5948a7f370c42d9fe2deb724139a1bfcb7b (diff) | |
| download | git-cba595ab1a7764aecfde2e8e59994f89b2cd2f2e.zip git-cba595ab1a7764aecfde2e8e59994f89b2cd2f2e.tar.gz git-cba595ab1a7764aecfde2e8e59994f89b2cd2f2e.tar.bz2 | |
Merge branch 'jk/loose-object-cache-oid'
Code clean-up.
* jk/loose-object-cache-oid:
prefer "hash mismatch" to "sha1 mismatch"
sha1-file: avoid "sha1 file" for generic use in messages
sha1-file: prefer "loose object file" to "sha1 file" in messages
sha1-file: drop has_sha1_file()
convert has_sha1_file() callers to has_object_file()
sha1-file: convert pass-through functions to object_id
sha1-file: modernize loose header/stream functions
sha1-file: modernize loose object file functions
http: use struct object_id instead of bare sha1
update comment references to sha1_object_info()
sha1-file: fix outdated sha1 comment references
Diffstat (limited to 'builtin/index-pack.c')
| -rw-r--r-- | builtin/index-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index ac1f4ea..31046c7 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -772,7 +772,7 @@ 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, OBJECT_INFO_QUICK); + has_object_file_with_flags(oid, OBJECT_INFO_QUICK); read_unlock(); } |