OSDN Git Service

t4150: test applying with a newline in subject
authorStephen Boyd <bebarino@gmail.com>
Tue, 16 Jun 2009 22:32:57 +0000 (15:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jun 2009 16:50:14 +0000 (09:50 -0700)
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>
t/t4150-am.sh

index d6ebbae..51c369a 100755 (executable)
@@ -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