From c2dc4c9fbb1f119be6ab55ff8676bf18b4b9446a Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 25 Oct 2024 03:00:55 -0400 Subject: packfile: drop sha1_pack_name() The sha1_pack_name() function has a few ugly bits: - it writes into a static strbuf (and not even a ring buffer of them), which can lead to subtle invalidation problems - it uses the term "sha1", but it's really using the_hash_algo, which could be sha256 There's only one caller of it left. And in fact that caller is better off using the underlying odb_pack_name() function itself, since it's just copying the result into its own strbuf anyway. Converting that caller lets us get rid of this now-obselete function. Signed-off-by: Jeff King Signed-off-by: Taylor Blau --- http.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'http.c') diff --git a/http.c b/http.c index 03802b9049..510332ab04 100644 --- a/http.c +++ b/http.c @@ -2579,7 +2579,8 @@ struct http_pack_request *new_direct_http_pack_request( preq->url = url; - strbuf_addf(&preq->tmpfile, "%s.temp", sha1_pack_name(packed_git_hash)); + odb_pack_name(&preq->tmpfile, packed_git_hash, "pack"); + strbuf_addstr(&preq->tmpfile, ".temp"); preq->packfile = fopen(preq->tmpfile.buf, "a"); if (!preq->packfile) { error("Unable to open local file %s for pack", -- cgit v1.3