From: Stephen Boyd <bebarino@gmail.com>
Date: Tue, 16 Jun 2009 22:32:57 +0000 (-0700)
Subject: t4150: test applying with a newline in subject
X-Git-Tag: v1.6.4-rc0~27^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b3c32ead20bc4d3baa6cffe00dd862f069463869?ds=inline;hp=--cc

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: <subject>".

This test ensures that fix stays valid.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

b3c32ead20bc4d3baa6cffe00dd862f069463869
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