diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-11-18 20:04:58 -0500 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-11-18 20:04:58 -0500 |
| commit | c6bb019724237deb91ba4a9185fd04507aadeb6a (patch) | |
| tree | 885f749a84017a4c993188af19b76afcaf0304fc /t | |
| parent | 01e19872862cd2235c14c6bb348fbeb170abbab7 (diff) | |
| parent | 99d0b829c7b376b1ff562a5782e24df47747bb65 (diff) | |
| download | git-jch.tar.gz | |
Merge branch 'ew/format-patch-mboxrd' into jchjch
Teach `format-patch` a convenient alias for `--pretty=mboxrd`.
* ew/format-patch-mboxrd:
format-patch: add --mboxrd alias for --pretty=mboxrd
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4014-format-patch.sh | 6 | ||||
| -rwxr-xr-x | t/t4150-am.sh | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index de1da4673d..69ed8b1ffa 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -2281,7 +2281,7 @@ test_expect_success 'format-patch --attach cover-letter only is non-multipart' ' test_line_count = 1 output ' -test_expect_success 'format-patch --pretty=mboxrd' ' +test_expect_success 'format-patch --mboxrd' ' sp=" " && cat >msg <<-INPUT_END && mboxrd should escape the body @@ -2316,7 +2316,9 @@ test_expect_success 'format-patch --pretty=mboxrd' ' INPUT_END C=$(git commit-tree HEAD^^{tree} -p HEAD <msg) && - git format-patch --pretty=mboxrd --stdout -1 $C~1..$C >patch && + git format-patch --mboxrd --stdout -1 $C~1..$C >patch && + git format-patch --pretty=mboxrd --stdout -1 $C~1..$C >compat && + test_cmp patch compat && git grep -h --no-index -A11 \ "^>From could trip up a loose mbox parser" patch >actual && test_cmp expect actual diff --git a/t/t4150-am.sh b/t/t4150-am.sh index cdad4b6880..9a128c16a6 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 format-patch --mboxrd --stdout -1 >mboxrd1 && grep "^>From could trip up a loose mbox parser" mboxrd1 && git checkout -f first && git am --patch-format=mboxrd mboxrd1 && |