diff options
author | Eric Wong <e@80x24.org> | 2022-12-22 21:16:19 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-12-25 08:32:45 +0100 |
commit | 4810946f6032a973ad752d06a32437bc9bb35e67 (patch) | |
tree | 0b81441620ac67b4a99ff69c2217ec1700ac60e0 /t/t4150-am.sh | |
parent | The first batch for 2.40 (diff) | |
download | git-4810946f6032a973ad752d06a32437bc9bb35e67.tar.xz git-4810946f6032a973ad752d06a32437bc9bb35e67.zip |
format-patch: support format.mboxrd with --stdout
mboxrd is a more robust output format when used with --stdout
and needs more exposure. Introducing this config knob lets
users choose the more robust format for all their --stdout
uses.
Relying on --pretty=mboxrd and including all of pretty-formats.txt
in the `git format-patch' documentation would likely be
confusing to users. Furthermore, this setting is useful across
multiple invocations. So introduce `format.mboxrd' as a boolean
configuration knob that changes the default --pretty=email format
to --pretty=mboxrd when (and only when) --stdout is in use.
Signed-off-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
-rwxr-xr-x | t/t4150-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index cdad4b6880..7646e856d5 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -1033,7 +1033,7 @@ test_expect_success 'am --patch-format=mboxrd handles mboxrd' ' >From extra escape for reversibility INPUT_END git commit -F msg && - git format-patch --pretty=mboxrd --stdout -1 >mboxrd1 && + git -c format.mboxrd format-patch --stdout -1 >mboxrd1 && grep "^>From could trip up a loose mbox parser" mboxrd1 && git checkout -f first && git am --patch-format=mboxrd mboxrd1 && |