summaryrefslogtreecommitdiff
path: root/http-walker.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-03-23 17:21:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-26 17:05:55 (GMT)
commitcf78ae4f3dcd1cf509a053023cc048f34f72140e (patch)
treee5d837799ab85a301a0a84dd226269eb0c09581f /http-walker.c
parent13068bf0a04c4c3cfc177f1aabc61037e319d595 (diff)
downloadgit-cf78ae4f3dcd1cf509a053023cc048f34f72140e.zip
git-cf78ae4f3dcd1cf509a053023cc048f34f72140e.tar.gz
git-cf78ae4f3dcd1cf509a053023cc048f34f72140e.tar.bz2
sha1_file: add repository argument to sha1_file_name
Add a repository argument to allow sha1_file_name callers to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. While at it, move the declaration to object-store.h, where it should be easier to find. 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 'http-walker.c')
-rw-r--r--http-walker.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/http-walker.c b/http-walker.c
index d850408..75d55d4 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "repository.h"
#include "commit.h"
#include "walker.h"
#include "http.h"
@@ -546,7 +547,7 @@ static int fetch_object(struct walker *walker, unsigned char *sha1)
ret = error("File %s has bad hash", hex);
} else if (req->rename < 0) {
struct strbuf buf = STRBUF_INIT;
- sha1_file_name(&buf, req->sha1);
+ sha1_file_name(the_repository, &buf, req->sha1);
ret = error("unable to write sha1 filename %s", buf.buf);
strbuf_release(&buf);
}