sha1_file: allow sha1_file_name to handle arbitrary repositories

stefanbeller · gitster · commit a68377b5dedb · 2018-03-26T10:05:55.000-07:00
Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/object-store.h b/object-store.h
@@ -125,8 +125,7 @@ void raw_object_store_clear(struct raw_object_store *o);
  * Put in `buf` the name of the file in the local object database that
  * would be used to store a loose object with the specified sha1.
  */
-#define sha1_file_name(r, b, s) sha1_file_name_##r(b, s)
-void sha1_file_name_the_repository(struct strbuf *buf, const unsigned char *sha1);
+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);
diff --git a/sha1_file.c b/sha1_file.c
@@ -323,9 +323,9 @@ static void fill_sha1_path(struct strbuf *buf, const unsigned char *sha1)
 	}
 }
 
-void sha1_file_name_the_repository(struct strbuf *buf, const unsigned char *sha1)
+void sha1_file_name(struct repository *r, struct strbuf *buf, const unsigned char *sha1)
 {
-	strbuf_addstr(buf, get_object_directory());
+	strbuf_addstr(buf, r->objects->objectdir);
 	strbuf_addch(buf, '/');
 	fill_sha1_path(buf, sha1);
 }

Original file line number	Diff line number	Diff line change
`@@ -323,9 +323,9 @@ static void fill_sha1_path(struct strbuf buf, const unsigned char sha1)`
`323`	`323`	`}`
`324`	`324`	`}`
`325`	`325`
`326`		`-void sha1_file_name_the_repository(struct strbuf buf, const unsigned char sha1)`
	`326`	`+void sha1_file_name(struct repository r, struct strbuf buf, const unsigned char *sha1)`
`327`	`327`	`{`
`328`		`- strbuf_addstr(buf, get_object_directory());`
	`328`	`+ strbuf_addstr(buf, r->objects->objectdir);`
`329`	`329`	`strbuf_addch(buf, '/');`
`330`	`330`	`fill_sha1_path(buf, sha1);`
`331`	`331`	`}`