diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2018-03-23 18:21:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-26 19:05:55 +0200 |
| commit | 1fea63e1da74b875790e8f2c63119c79fc5b52a6 (patch) | |
| tree | 1afa6e5dbca6e85668b022337fa00a6816c18a85 /sha1_file.c | |
| parent | sha1_file: allow open_sha1_file to handle arbitrary repositories (diff) | |
| download | git-1fea63e1da74b875790e8f2c63119c79fc5b52a6.tar.xz git-1fea63e1da74b875790e8f2c63119c79fc5b52a6.zip | |
sha1_file: allow map_sha1_file_1 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>
Diffstat (limited to '')
| -rw-r--r-- | sha1_file.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sha1_file.c b/sha1_file.c index 1fa32c8a06..1d5d23dfe2 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -929,10 +929,8 @@ static int open_sha1_file(struct repository *r, * Map the loose object at "path" if it is not NULL, or the path found by * searching for a loose object named "sha1". */ -#define map_sha1_file_1(r, p, s, si) map_sha1_file_1_##r(p, s, si) -static void *map_sha1_file_1_the_repository(const char *path, - const unsigned char *sha1, - unsigned long *size) +static void *map_sha1_file_1(struct repository *r, const char *path, + const unsigned char *sha1, unsigned long *size) { void *map; int fd; @@ -940,7 +938,7 @@ static void *map_sha1_file_1_the_repository(const char *path, if (path) fd = git_open(path); else - fd = open_sha1_file(the_repository, sha1, &path); + fd = open_sha1_file(r, sha1, &path); map = NULL; if (fd >= 0) { struct stat st; |