kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Jeff King 2019-01-07 03:34:12 -05:00 committed by Junio C Hamano
parent cb1c8d1d3c
commit c93206b412
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/cat-file.c
View File

@ -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. * elements above, so you can retrieve the response from there.
*/ */
struct object_info info; struct object_info info;


/* /*
* This flag will be true if the requested batch format and options * 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. * optimized out.
*/ */
unsigned skip_object_info : 1; 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. * object.
*/ */
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));

4
builtin/pack-objects.c
View File

@ -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... * at this point...
*/ */
give_up: 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) { 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; * 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 if that fails, the error will be recorded in oe_type(entry)
* and dealt with in prepare_pack(). * and dealt with in prepare_pack().
*/ */

2
cache.h
View File

@ -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. * blobs. This has a difference only if extensions.partialClone is set.
* *
* Its default value is 1. * Its default value is 1.