Merge branch 'js/rebase-am'

diff --git a/http-walker.c b/http-walker.c
index b3334bf657b5ea64e779eb470525eb0b7337baa9..0a392c85b67af254ddeca382faa79458c4ec3ca8 100644 (file)
--- a/http-walker.c
+++ b/http-walker.c
@@ -547,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(the_repository, &buf, req->sha1);
+               loose_object_path(the_repository, &buf, req->sha1);
                ret = error("unable to write sha1 filename %s", buf.buf);
                strbuf_release(&buf);
        }