From b3c32ead20bc4d3baa6cffe00dd862f069463869 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Tue, 16 Jun 2009 15:32:57 -0700 Subject: [PATCH] t4150: test applying with a newline in subject Commit 4b7cc26 (git-am: use printf instead of echo on user-supplied strings, 2007-05-25) fixed a bug where subjects with newlines would cause git-am to echo multiple lines when it says "Applying: ". This test ensures that fix stays valid. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano --- t/t4150-am.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/t/t4150-am.sh b/t/t4150-am.sh index d6ebbaebe2..51c369ad14 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -305,4 +305,12 @@ test_expect_success 'am into an unborn branch' ' test "z$result" = "z$(git rev-parse first^{tree})" ' +test_expect_success 'am newline in subject' ' + git checkout first && + test_tick && + sed -e "s/second/second \\\n foo/" patch1 > patchnl && + git am < patchnl > output.out 2>&1 && + grep "^Applying: second \\\n foo$" output.out +' + test_done -- 2.11.4.GIT