Skip to content

Commit e977fc7

Browse files
stefanbellergitster
authored andcommitted
sha1_file: add repository argument to sha1_loose_object_info
Add a repository argument to allow the sha1_loose_object_info caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]> Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e35454f commit e977fc7

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

sha1_file.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,9 +1152,10 @@ int parse_sha1_header(const char *hdr, unsigned long *sizep)
11521152
return parse_sha1_header_extended(hdr, &oi, 0);
11531153
}
11541154

1155-
static int sha1_loose_object_info(const unsigned char *sha1,
1156-
struct object_info *oi,
1157-
int flags)
1155+
#define sha1_loose_object_info(r, s, o, f) sha1_loose_object_info_##r(s, o, f)
1156+
static int sha1_loose_object_info_the_repository(const unsigned char *sha1,
1157+
struct object_info *oi,
1158+
int flags)
11581159
{
11591160
int status = 0;
11601161
unsigned long mapsize;
@@ -1273,7 +1274,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
12731274
break;
12741275

12751276
/* Most likely it's a loose object. */
1276-
if (!sha1_loose_object_info(real, oi, flags))
1277+
if (!sha1_loose_object_info(the_repository, real, oi, flags))
12771278
return 0;
12781279

12791280
/* Not a loose object; someone else may have just packed it. */

0 commit comments

Comments
 (0)