undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format.attach: allow empty value to disable multi-part messages

Browse Source 
When a lower precedence configuration file (e.g. /etc/gitconfig)
defines format.attach in any way, there was no way to disable it in
a more specific configuration file (e.g. $HOME/.gitconfig).

Change the behaviour of setting it to an empty string.  It used to
mean that the result is still a multipart message with only dashes
used as a multi-part separator, but now it resets the setting to
the default (which would be to give an inline patch, unless other
command line options are in effect).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2023-02-17 15:33:37 -08:00
parent d9d677b2d8
commit 50bebf98d9
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/config/format.txt
View File

@ -3,7 +3,8 @@ format.attach::
'format-patch'. The value can also be a double quoted string 'format-patch'. The value can also be a double quoted string
which will enable attachments as the default and set the which will enable attachments as the default and set the
value as the boundary. See the --attach option in value as the boundary. See the --attach option in
linkgit:git-format-patch[1]. linkgit:git-format-patch[1]. To countermand an earlier
value, set it to an empty string.
format.from:: format.from::
Provides the default value for the `--from` option to format-patch. Provides the default value for the `--from` option to format-patch.

2
builtin/log.c
View File

@ -1007,6 +1007,8 @@ static int git_format_config(const char *var, const char *value, void *cb)
if (!strcmp(var, "format.attach")) { if (!strcmp(var, "format.attach")) {
if (value && *value) if (value && *value)
default_attach = xstrdup(value); default_attach = xstrdup(value);
else if (value && !*value)
FREE_AND_NULL(default_attach);
else else
default_attach = xstrdup(git_version_string); default_attach = xstrdup(git_version_string);
return 0; return 0;

18
t/t4014-format-patch.sh
View File

@ -2281,6 +2281,24 @@ test_expect_success 'format-patch --attach cover-letter only is non-multipart' '
test_line_count = 1 output test_line_count = 1 output
' '
test_expect_success 'format-patch with format.attach' '
test_when_finished "rm -fr patches" &&
separator=attachment-separator &&
test_config format.attach "$separator" &&
filename=$(git format-patch -o patches -1) &&
grep "^Content-Type: multipart/.*$separator" "$filename"
'
test_expect_success 'format-patch with format.attach=disabled' '
test_when_finished "rm -fr patches" &&
separator=attachment-separator &&
test_config_global format.attach "$separator" &&
test_config format.attach "" &&
filename=$(git format-patch -o patches -1) &&
# The output should not even declare content type for text/plain.
! grep "^Content-Type: multipart/" "$filename"
'
test_expect_success '-c format.mboxrd format-patch' ' test_expect_success '-c format.mboxrd format-patch' '
sp=" " && sp=" " &&
cat >msg <<-INPUT_END && cat >msg <<-INPUT_END &&