sha1_file: add repository argument to map_sha1_file

Add a repository argument to allow map_sha1_file callers to be more
specific about which repository to handle. 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.

While at it, move the declaration to object-store.h, where it should
be easier to find.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
2018-03-23 18:21:14 +01:00
committed by Junio C Hamano
parent 332295d7e4
commit e35454fa62
4 changed files with 9 additions and 4 deletions

View File

@ -961,7 +961,7 @@ static void *map_sha1_file_1_the_repository(const char *path,
return map;
}
void *map_sha1_file(const unsigned char *sha1, unsigned long *size)
void *map_sha1_file_the_repository(const unsigned char *sha1, unsigned long *size)
{
return map_sha1_file_1(the_repository, NULL, sha1, size);
}
@ -1185,7 +1185,7 @@ static int sha1_loose_object_info(const unsigned char *sha1,
return 0;
}
map = map_sha1_file(sha1, &mapsize);
map = map_sha1_file(the_repository, sha1, &mapsize);
if (!map)
return -1;