From: Mirko Faina <mroik@delayed.space>
To: git@vger.kernel.org
Cc: Mirko Faina <mroik@delayed.space>
Subject: [PATCH 4/7] format.commitListFormat: strip meaning from empty
Date: Sun, 15 Mar 2026 00:20:47 +0100 [thread overview]
Message-ID: <1eb2b76eebe8aa7b876c8aaceba4241ccd81ba4f.1773530191.git.mroik@delayed.space> (raw)
In-Reply-To: <cover.1773530191.git.mroik@delayed.space>
The configuration variable format.commitListFormat allows for an empty
value. This is unusual and can create issues when interacting with this
configuration variable through the cli interface.
Strip meaning to format.commitListFormat with an empty value.
Signed-off-by: Mirko Faina <mroik@delayed.space>
---
builtin/log.c | 11 +----------
t/t4014-format-patch.sh | 11 -----------
2 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index a7f129d583..47126f9064 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1055,17 +1055,8 @@ static int git_format_config(const char *var, const char *value,
return 0;
}
if (!strcmp(var, "format.commitlistformat")) {
- struct strbuf tmp = STRBUF_INIT;
- strbuf_init(&tmp, 0);
- if (value)
- strbuf_addstr(&tmp, value);
- else
- strbuf_addstr(&tmp, "log:[%(count)/%(total)] %s");
-
FREE_AND_NULL(cfg->fmt_cover_letter_commit_list);
- git_config_string(&cfg->fmt_cover_letter_commit_list, var, tmp.buf);
- strbuf_release(&tmp);
- return 0;
+ return git_config_string(&cfg->fmt_cover_letter_commit_list, var, value);
}
if (!strcmp(var, "format.outputdirectory")) {
FREE_AND_NULL(cfg->config_output_directory);
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index d2a775f78d..ca37f40a6a 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -451,17 +451,6 @@ test_expect_success 'cover letter config with count and author' '
test_line_count = 2 result
'
-test_expect_success 'cover letter config commitlistformat set but no format' '
- test_when_finished "rm -rf patches result" &&
- test_when_finished "git config unset format.coverletter" &&
- test_when_finished "git config unset format.commitlistformat" &&
- git config set format.coverletter true &&
- printf "\tcommitlistformat" >> .git/config &&
- git format-patch -o patches HEAD~2 &&
- grep -E "^[[[:digit:]]+/[[:digit:]]+] .*" patches/0000-cover-letter.patch >result &&
- test_line_count = 2 result
-'
-
test_expect_success 'cover letter config commitlistformat set to shortlog' '
test_when_finished "rm -rf patches result" &&
test_when_finished "git config unset format.coverletter" &&
--
2.53.0.959.g497ff81fa9
next prev parent reply other threads:[~2026-03-14 23:21 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-14 23:20 [PATCH 0/7] improve "git format-patch --commit-list-format" Mirko Faina
2026-03-14 23:20 ` [PATCH 1/7] pretty.c: better die message %(count) and %(total) Mirko Faina
2026-03-14 23:20 ` [PATCH 2/7] format-patch: refactor generate_commit_list_cover Mirko Faina
2026-03-14 23:20 ` [PATCH 3/7] format-patch: rename --cover-letter-format option Mirko Faina
2026-03-14 23:20 ` Mirko Faina [this message]
2026-03-14 23:20 ` [PATCH 5/7] format-patch: wrap generate_commit_list_cover() Mirko Faina
2026-03-17 15:32 ` Kristoffer Haugsbakk
2026-03-17 16:18 ` Mirko Faina
2026-03-14 23:20 ` [PATCH 6/7] format-patch: add preset for --commit-list-format Mirko Faina
2026-03-14 23:20 ` [PATCH 7/7] format-patch: --commit-list-format without prefix Mirko Faina
2026-03-17 15:29 ` Kristoffer Haugsbakk
2026-03-17 16:20 ` Mirko Faina
2026-03-19 22:38 ` [PATCH v2 0/8] improve "git format-patch --commit-list-format" Mirko Faina
2026-03-19 22:38 ` [PATCH v2 1/8] pretty.c: better die message %(count) and %(total) Mirko Faina
2026-03-19 22:38 ` [PATCH v2 2/8] format-patch: refactor generate_commit_list_cover Mirko Faina
2026-03-19 22:38 ` [PATCH v2 3/8] format-patch: rename --cover-letter-format option Mirko Faina
2026-03-19 22:38 ` [PATCH v2 4/8] docs/pretty-formats: add %(count) and %(total) Mirko Faina
2026-03-23 10:29 ` Kristoffer Haugsbakk
2026-03-23 14:00 ` Mirko Faina
2026-03-19 22:38 ` [PATCH v2 5/8] format.commitListFormat: strip meaning from empty Mirko Faina
2026-03-19 22:38 ` [PATCH v2 6/8] format-patch: wrap generate_commit_list_cover() Mirko Faina
2026-03-19 22:38 ` [PATCH v2 7/8] format-patch: add preset for --commit-list-format Mirko Faina
2026-03-19 22:38 ` [PATCH v2 8/8] format-patch: --commit-list-format without prefix Mirko Faina
2026-03-23 16:57 ` [PATCH v3 0/8] improve "git format-patch --commit-list-format" Mirko Faina
2026-03-23 16:57 ` [PATCH v3 1/8] pretty.c: better die message %(count) and %(total) Mirko Faina
2026-03-23 16:57 ` [PATCH v3 2/8] format-patch: refactor generate_commit_list_cover Mirko Faina
2026-03-23 16:57 ` [PATCH v3 3/8] format-patch: rename --cover-letter-format option Mirko Faina
2026-03-23 16:57 ` [PATCH v3 4/8] docs/pretty-formats: add %(count) and %(total) Mirko Faina
2026-03-23 16:57 ` [PATCH v3 5/8] format.commitListFormat: strip meaning from empty Mirko Faina
2026-03-23 16:57 ` [PATCH v3 6/8] format-patch: wrap generate_commit_list_cover() Mirko Faina
2026-03-23 16:57 ` [PATCH v3 7/8] format-patch: add preset for --commit-list-format Mirko Faina
2026-03-23 16:57 ` [PATCH v3 8/8] format-patch: --commit-list-format without prefix Mirko Faina
2026-03-23 20:10 ` [PATCH v3 0/8] improve "git format-patch --commit-list-format" Junio C Hamano
2026-03-24 16:19 ` Kristoffer Haugsbakk
2026-03-26 14:29 ` Phillip Wood
2026-03-26 16:37 ` Junio C Hamano
2026-03-27 1:13 ` Mirko Faina
2026-03-27 16:04 ` Junio C Hamano
2026-03-27 16:18 ` Mirko Faina
2026-03-27 16:47 ` Junio C Hamano
2026-03-26 16:34 ` D. Ben Knoble
2026-03-26 17:15 ` Mirko Faina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1eb2b76eebe8aa7b876c8aaceba4241ccd81ba4f.1773530191.git.mroik@delayed.space \
--to=mroik@delayed.space \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).