update comment references to sha1_object_info()
Commit abef9020e3 (sha1_file: convert sha1_object_info* to object_id, 2018-03-12) renamed the function to oid_object_info(), but missed some comments which mention it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jan 7, 2019 at 03:34 UTC
c93206b412dade4e480588ad5902f4b950d908ab
3 files changed
+6
-6
builtin/cat-file.c
+3
-3
@@ -209,14 +209,14 @@ struct expand_data {
209
210
/*
211
* After a mark_query run, this object_info is set up to be
212
- * passed to sha1_object_info_extended. It will point to the data
212
+ * passed to oid_object_info_extended. It will point to the data
213
* elements above, so you can retrieve the response from there.
214
*/
215
struct object_info info;
216
217
/*
218
* This flag will be true if the requested batch format and options
219
- * don't require us to call sha1_object_info, which can then be
219
+ * don't require us to call oid_object_info, which can then be
220
* optimized out.
221
*/
222
unsigned skip_object_info : 1;
@@ -490,7 +490,7 @@ static int batch_objects(struct batch_options *opt)
490
491
/*
492
* Expand once with our special mark_query flag, which will prime the
493
- * object_info to be handed to sha1_object_info_extended for each
493
+ * object_info to be handed to oid_object_info_extended for each
494
* object.
495
*/
496
memset(&data, 0, sizeof(data));
builtin/pack-objects.c
+2
-2
@@ -1642,7 +1642,7 @@ static void check_object(struct object_entry *entry)
1642
1643
/*
1644
* No choice but to fall back to the recursive delta walk
1645
- * with sha1_object_info() to find about the object type
1645
+ * with oid_object_info() to find about the object type
1646
* at this point...
1647
*/
1648
give_up:
@@ -1718,7 +1718,7 @@ static void drop_reused_delta(struct object_entry *entry)
1718
if (packed_object_info(the_repository, IN_PACK(entry), entry->in_pack_offset, &oi) < 0) {
1719
/*
1720
* We failed to get the info from this pack for some reason;
1721
- * fall back to sha1_object_info, which may find another copy.
1721
+ * fall back to oid_object_info, which may find another copy.
1722
* And if that fails, the error will be recorded in oe_type(entry)
1723
* and dealt with in prepare_pack().
1724
*/
cache.h
+1
-1
@@ -1592,7 +1592,7 @@ extern int odb_mkstemp(struct strbuf *temp_filename, const char *pattern);
1592
extern int odb_pack_keep(const char *name);
1593
1594
/*
1595
- * Set this to 0 to prevent sha1_object_info_extended() from fetching missing
1595
+ * Set this to 0 to prevent oid_object_info_extended() from fetching missing
1596
* blobs. This has a difference only if extensions.partialClone is set.
1597
*
1598
* Its default value is 1.