Re: [PATCH] Move format-patch base commit and prerequisites before email signature
From: Junio C Hamano <hidden>
Date: 2016-09-15 17:06:28
Josh Triplett [off-list ref] writes:
I'd suggest squashing in an *additional* patch to the testsuite to ensure the presence of the blank line:
Thanks, will do.
quoted hunk
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 535857e..8d90a6e 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh@@ -1515,8 +1515,9 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' ' test_expect_success 'format-patch --base' ' git checkout side && - git format-patch --stdout --base=HEAD~3 -1 | tail -n 6 >actual && - echo "base-commit: $(git rev-parse HEAD~3)" >expected && + git format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual && + echo >expected && + echo "base-commit: $(git rev-parse HEAD~3)" >>expected && echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk "{print \$1}")" >>expected && echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk "{print \$1}")" >>expected && signature >> expected &&