diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:27 -0800 |
| commit | cba595ab1a7764aecfde2e8e59994f89b2cd2f2e (patch) | |
| tree | 832b23d5963d8931796fc3b9951e3708d1a40207 /builtin/pack-objects.c | |
| parent | 96e6547c2e4c137222c01582b52c0c974a02fd63 (diff) | |
| parent | 01f8d5948a7f370c42d9fe2deb724139a1bfcb7b (diff) | |
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/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index bd67491c16..68e2e66db2 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1643,7 +1643,7 @@ static void check_object(struct object_entry *entry) /* * No choice but to fall back to the recursive delta walk - * with sha1_object_info() to find about the object type + * with oid_object_info() to find about the object type * at this point... */ give_up: @@ -1719,7 +1719,7 @@ static void drop_reused_delta(struct object_entry *entry) if (packed_object_info(the_repository, IN_PACK(entry), entry->in_pack_offset, &oi) < 0) { /* * We failed to get the info from this pack for some reason; - * fall back to sha1_object_info, which may find another copy. + * fall back to oid_object_info, which may find another copy. * And if that fails, the error will be recorded in oe_type(entry) * and dealt with in prepare_pack(). */ |