summaryrefslogtreecommitdiff
path: root/builtin/cat-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-02-07 06:05:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-07 06:05:27 (GMT)
commitcba595ab1a7764aecfde2e8e59994f89b2cd2f2e (patch)
tree832b23d5963d8931796fc3b9951e3708d1a40207 /builtin/cat-file.c
parent96e6547c2e4c137222c01582b52c0c974a02fd63 (diff)
parent01f8d5948a7f370c42d9fe2deb724139a1bfcb7b (diff)
downloadgit-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/cat-file.c')
-rw-r--r--builtin/cat-file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 8487cd7..0f09238 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -211,14 +211,14 @@ struct expand_data {
/*
* After a mark_query run, this object_info is set up to be
- * passed to sha1_object_info_extended. It will point to the data
+ * passed to oid_object_info_extended. It will point to the data
* elements above, so you can retrieve the response from there.
*/
struct object_info info;
/*
* This flag will be true if the requested batch format and options
- * don't require us to call sha1_object_info, which can then be
+ * don't require us to call oid_object_info, which can then be
* optimized out.
*/
unsigned skip_object_info : 1;
@@ -496,7 +496,7 @@ static int batch_objects(struct batch_options *opt)
/*
* Expand once with our special mark_query flag, which will prime the
- * object_info to be handed to sha1_object_info_extended for each
+ * object_info to be handed to oid_object_info_extended for each
* object.
*/
memset(&data, 0, sizeof(data));