[PATCH 34/39] pack: allow sha1_file_name to handle arbitrary repositories
From: Jonathan Nieder <hidden>
Date: 2017-08-30 07:14:57
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Stefan Beller <redacted> Signed-off-by: Jonathan Nieder <redacted> --- object-store.h | 3 +-- sha1_file.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/object-store.h b/object-store.h
index 518da80367..fe2187fd65 100644
--- a/object-store.h
+++ b/object-store.h@@ -60,8 +60,7 @@ struct packed_git { * The return value is a pointer to a statically allocated buffer that * is overwritten each time the function is called. */ -#define sha1_file_name(r, s) sha1_file_name_##r(s) -extern const char *sha1_file_name_the_repository(const unsigned char *sha1); +extern const char *sha1_file_name(struct repository *r, const unsigned char *sha1); #define map_sha1_file(r, s, sz) map_sha1_file_##r(s, sz) extern void *map_sha1_file_the_repository(const unsigned char *sha1, unsigned long *size);
diff --git a/sha1_file.c b/sha1_file.c
index 81bc1ab309..ac57eea0f2 100644
--- a/sha1_file.c
+++ b/sha1_file.c@@ -254,12 +254,12 @@ static void fill_sha1_path(struct strbuf *buf, const unsigned char *sha1) } } -const char *sha1_file_name_the_repository(const unsigned char *sha1) +const char *sha1_file_name(struct repository *r, const unsigned char *sha1) { static struct strbuf buf = STRBUF_INIT; strbuf_reset(&buf); - strbuf_addf(&buf, "%s/", get_object_directory()); + strbuf_addf(&buf, "%s/", r->objectdir); fill_sha1_path(&buf, sha1); return buf.buf;
--
2.14.1.581.gf28d330327