From: Stephen Boyd <bebarino@gmail.com>
To: git@vger.kernel.org
Cc: Thomas Adam <thomas.adam22@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Johannes Sixt <j.sixt@viscovery.net>
Subject: [PATCHv4 1/5] t4150: test applying with a newline in subject
Date: Tue, 16 Jun 2009 15:32:57 -0700 [thread overview]
Message-ID: <1245191581-11127-2-git-send-email-bebarino@gmail.com> (raw)
In-Reply-To: <1245191581-11127-1-git-send-email-bebarino@gmail.com>
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>
---
Nothing new here.
t/t4150-am.sh | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index d6ebbae..51c369a 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
--
1.6.3.2.306.g4f4fa
next prev parent reply other threads:[~2009-06-16 22:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-16 2:05 [PATCHv3 0/4] Teach shell scripts to be quiet Stephen Boyd
2009-06-16 2:05 ` [PATCHv3 1/4] t4150: test applying with a newline in subject Stephen Boyd
2009-06-16 2:05 ` [PATCHv3 2/4] git-sh-setup: introduce say() for quiet options Stephen Boyd
2009-06-16 2:05 ` [PATCHv3 3/4] submodule, repack: migrate to git-sh-setup's say() Stephen Boyd
2009-06-16 2:05 ` [PATCHv3 4/4] am, rebase: teach quiet option Stephen Boyd
2009-06-16 5:57 ` Junio C Hamano
2009-06-16 7:50 ` Stephen Boyd
2009-06-16 5:56 ` [PATCHv3 3/4] submodule, repack: migrate to git-sh-setup's say() Junio C Hamano
2009-06-16 6:18 ` Junio C Hamano
2009-06-16 7:38 ` Stephen Boyd
2009-06-16 8:13 ` [PATCHv3 2/4] git-sh-setup: introduce say() for quiet options Johannes Sixt
2009-06-16 22:32 ` [PATCHv4 0/5] Teach shell scripts to be quiet Stephen Boyd
2009-06-16 22:32 ` Stephen Boyd [this message]
2009-06-16 22:32 ` [PATCHv4 2/5] am: suppress apply errors when using 3-way Stephen Boyd
2009-06-16 22:32 ` [PATCHv4 3/5] git-sh-setup: introduce say() for quiet options Stephen Boyd
2009-06-16 22:33 ` [PATCHv4 4/5] submodule, repack: migrate to git-sh-setup's say() Stephen Boyd
2009-06-16 22:33 ` [PATCHv4 5/5] am, rebase: teach quiet option Stephen Boyd
2009-06-18 1:07 ` [PATCHv4 6/5] stash: " Stephen Boyd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1245191581-11127-2-git-send-email-bebarino@gmail.com \
--to=bebarino@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=thomas.adam22@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).