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/merge-tree.c | |
| parent | Merge branch 'pw/rebase-x-sanity-check' (diff) | |
| parent | prefer "hash mismatch" to "sha1 mismatch" (diff) | |
| download | tgif-cba595ab1a7764aecfde2e8e59994f89b2cd2f2e.tar.xz | |
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/merge-tree.c')
0 files changed, 0 insertions, 0 deletions