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>

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 2ca56fd086bf6bef7595ad008d9eda2c64901cf5..baaafbdcf375f87f7c3b5af239c51172f8320f84 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -209,14 +209,14 @@ struct expand_data {
 
        /*
         * After a mark_query run, this object_info is set up to be
 
        /*
         * 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
         * 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;
         * optimized out.
         */
        unsigned skip_object_info : 1;


@@ -490,7 +490,7 @@ static int batch_objects(struct batch_options *opt)
 
        /*
         * Expand once with our special mark_query flag, which will prime the
 
        /*
         * 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));
         * object.
         */
        memset(&data, 0, sizeof(data));

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 24bba8147fc96ec2b124aa659c981af08e7a688d..d4c3987f3e30dcc647f1fdcdece07db4e956574f 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1642,7 +1642,7 @@ static void check_object(struct object_entry *entry)
 
                /*
                 * No choice but to fall back to the recursive delta walk
 
                /*
                 * 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:
                 * at this point...
                 */
                give_up:


@@ -1718,7 +1718,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;
        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().
                 */
                 * And if that fails, the error will be recorded in oe_type(entry)
                 * and dealt with in prepare_pack().
                 */

diff --git a/cache.h b/cache.h
index ca36b44ee0b5851f837616c322a201ac420a90d2..587512747bbc3207354dde255742bd97e155054a 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1592,7 +1592,7 @@ extern int odb_mkstemp(struct strbuf *temp_filename, const char *pattern);
 extern int odb_pack_keep(const char *name);
 
 /*
 extern int odb_pack_keep(const char *name);
 
 /*

- * Set this to 0 to prevent sha1_object_info_extended() from fetching missing
+ * Set this to 0 to prevent oid_object_info_extended() from fetching missing

  * blobs. This has a difference only if extensions.partialClone is set.
  *
  * Its default value is 1.
  * blobs. This has a difference only if extensions.partialClone is set.
  *
  * Its default value is 1.