From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Eric Sunshine <sunshine@sunshineco.com>,
Tanky Woo <wtq1990@gmail.com>,
Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH v2 2/5] add -p: demonstrate failure when running 'edit' after a split
Date: Thu, 16 Apr 2015 09:02:28 +0200 [thread overview]
Message-ID: <1429167751-19398-3-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <1429167751-19398-1-git-send-email-Matthieu.Moy@imag.fr>
The test passes if one replaces the 'e' command with a 'y' command in
the 'add -p' session.
Reported-by: Tanky Woo <wtq1990@gmail.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
t/t3701-add-interactive.sh | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index b63b9d4..deae948 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -332,6 +332,28 @@ test_expect_success 'split hunk "add -p (edit)"' '
! grep "^+15" actual
'
+test_expect_failure 'split hunk "add -p (no, yes, edit)"' '
+ cat >test <<-\EOF &&
+ 5
+ 10
+ 20
+ 21
+ 30
+ 31
+ 40
+ 50
+ 60
+ EOF
+ git reset &&
+ # test sequence is s(plit), n(o), y(es), e(dit)
+ # q n q q is there to make sure we exit at the end.
+ printf "%s\n" s n y e q n q q |
+ EDITOR=: git add -p 2>error &&
+ test_must_be_empty error &&
+ git diff >actual &&
+ ! grep "^+31" actual
+'
+
test_expect_success 'patch mode ignores unmerged entries' '
git reset --hard &&
test_commit conflict &&
--
2.4.0.rc1.42.g9642cc6
next prev parent reply other threads:[~2015-04-16 7:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-14 1:56 Git add -p “Your edited hunk does not apply. Edit again” Tanky Woo
2015-04-14 9:43 ` Matthieu Moy
2015-04-14 11:32 ` [PATCH 0/4] demonstrate add -p and stash -p failures Matthieu Moy
2015-04-14 11:32 ` [PATCH 1/4] add -p: demonstrate failure when running 'edit' after a split Matthieu Moy
2015-04-14 20:46 ` Eric Sunshine
2015-04-14 11:32 ` [PATCH 2/4] t3904-stash-patch: fix test description Matthieu Moy
2015-04-14 11:32 ` [PATCH 3/4] t3904-stash-patch: factor PERL prereq at the top of the file Matthieu Moy
2015-04-14 11:32 ` [PATCH 4/4] stash -p: demonstrate failure of split with mixed y/n Matthieu Moy
2015-04-14 20:46 ` Eric Sunshine
2015-04-14 18:00 ` [PATCH 0/4] demonstrate add -p and stash -p failures Junio C Hamano
2015-04-16 7:02 ` [PATCH v2 0/5] " Matthieu Moy
2015-04-16 7:02 ` [PATCH v2 1/5] t3701-add-interactive: simplify code Matthieu Moy
2015-04-16 7:02 ` Matthieu Moy [this message]
2015-04-16 7:02 ` [PATCH v2 3/5] t3904-stash-patch: fix test description Matthieu Moy
2015-04-16 7:02 ` [PATCH v2 4/5] t3904-stash-patch: factor PERL prereq at the top of the file Matthieu Moy
2015-04-16 7:02 ` [PATCH v2 5/5] stash -p: demonstrate failure of split with mixed y/n Matthieu Moy
[not found] ` <CALv9gbMshdNhB58Otx5h8rmtCAU4qo9eNTqKSMzD_Phy7Sataw@mail.gmail.com>
2015-04-14 14:00 ` Git add -p “Your edited hunk does not apply. Edit again” Matthieu Moy
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=1429167751-19398-3-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
--cc=wtq1990@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).