sha1_file: allow map_sha1_file to handle arbitrary repositories

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:20 +01:00 committed by Junio C Hamano
parent 1fea63e1da
commit bd27f50c80
2 changed files with 4 additions and 4 deletions

View file

@ -127,7 +127,6 @@ void raw_object_store_clear(struct raw_object_store *o);
*/
void sha1_file_name(struct repository *r, struct strbuf *buf, const unsigned char *sha1);
#define map_sha1_file(r, s, sz) map_sha1_file_##r(s, sz)
void *map_sha1_file_the_repository(const unsigned char *sha1, unsigned long *size);
void *map_sha1_file(struct repository *r, const unsigned char *sha1, unsigned long *size);
#endif /* OBJECT_STORE_H */

View file

@ -957,9 +957,10 @@ static void *map_sha1_file_1(struct repository *r, const char *path,
return map;
}
void *map_sha1_file_the_repository(const unsigned char *sha1, unsigned long *size)
void *map_sha1_file(struct repository *r,
const unsigned char *sha1, unsigned long *size)
{
return map_sha1_file_1(the_repository, NULL, sha1, size);
return map_sha1_file_1(r, NULL, sha1, size);
}
static int unpack_sha1_short_header(git_zstream *stream,