summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2017-06-24 12:12:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-24 18:09:50 (GMT)
commit0375f472d484041f9b1e5550b57d69286b3322e7 (patch)
tree04ac5e22c3c26373ed5b6e2389b9ce80738230ed /sha1_name.c
parent5a5bd5765ac5d180bf540ba7c6540a9f3dc16f4b (diff)
downloadgit-0375f472d484041f9b1e5550b57d69286b3322e7.zip
git-0375f472d484041f9b1e5550b57d69286b3322e7.tar.gz
git-0375f472d484041f9b1e5550b57d69286b3322e7.tar.bz2
sha1_file: let for_each_file_in_obj_subdir() handle subdir names
The function for_each_file_in_obj_subdir() takes a object subdirectory number and expects the name of the same subdirectory to be included in the path strbuf. Avoid this redundancy by letting the function append the hexadecimal subdirectory name itself. This makes it a bit easier and safer to use the function -- it becomes impossible to specify different subdirectories in subdir_nr and path. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 76cb76a..8de0e2d 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -109,7 +109,6 @@ static void find_short_object_filename(struct disambiguate_state *ds)
if (!alt->loose_objects_subdir_seen[subdir_nr]) {
struct strbuf *buf = alt_scratch_buf(alt);
- strbuf_addf(buf, "%02x/", subdir_nr);
for_each_file_in_obj_subdir(subdir_nr, buf,
append_loose_object,
NULL, NULL,