diff options
| author | Stefan Beller <sbeller@google.com> | 2018-03-23 18:21:20 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-26 19:05:55 +0200 |
| commit | bd27f50c801410433542a31122985b7d808b0a7f (patch) | |
| tree | cc72707cf48d8190900a4b7dc81f85e828cc0e1c | |
| parent | sha1_file: allow map_sha1_file_1 to handle arbitrary repositories (diff) | |
| download | git-bd27f50c801410433542a31122985b7d808b0a7f.tar.xz git-bd27f50c801410433542a31122985b7d808b0a7f.zip | |
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>
| -rw-r--r-- | object-store.h | 3 | ||||
| -rw-r--r-- | sha1_file.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/object-store.h b/object-store.h index d9cc875153..fef33f345f 100644 --- a/object-store.h +++ b/object-store.h @@ -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 */ diff --git a/sha1_file.c b/sha1_file.c index 1d5d23dfe2..9addad6887 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -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, |