From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Jonathan Nieder <jrnieder@gmail.com>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 06/10] t3502, t3510: clarify cherry-pick -m failure
Date: Wed, 14 Dec 2011 22:24:33 +0530 [thread overview]
Message-ID: <1323881677-11117-7-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1323881677-11117-1-git-send-email-artagnon@gmail.com>
The "cherry-pick persists opts correctly" test in t3510
(cherry-pick-sequence) can cause some confusion, because the command
actually has two points of failure:
1. "-m 1" is specified on the command-line despite the base commit
"initial" not being a merge-commit.
2. The revision range indicates that there will be a conflict that
needs to be resolved.
Although the former error is trapped, and cherry-pick die()s with the
exit status 128, the reader may be distracted by the latter. Fix this
by changing the revision range to something that wouldn't cause a
conflict. Additionally, explicitly check the exit code in
"cherry-pick a non-merge with -m should fail" in t3502
(cherry-pick-merge) to reassure the reader that this failure has
nothing to do with the sequencer itself.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
t/t3502-cherry-pick-merge.sh | 2 +-
t/t3510-cherry-pick-sequence.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh
index 0ab52da..e37547f 100755
--- a/t/t3502-cherry-pick-merge.sh
+++ b/t/t3502-cherry-pick-merge.sh
@@ -35,7 +35,7 @@ test_expect_success 'cherry-pick a non-merge with -m should fail' '
git reset --hard &&
git checkout a^0 &&
- test_must_fail git cherry-pick -m 1 b &&
+ test_expect_code 128 git cherry-pick -m 1 b &&
git diff --exit-code a --
'
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index b6e822e..163ce7d 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -53,7 +53,7 @@ test_expect_success 'cherry-pick persists data on failure' '
test_expect_success 'cherry-pick persists opts correctly' '
pristine_detach initial &&
- test_expect_code 128 git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours base..anotherpick &&
+ test_expect_code 128 git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours initial..anotherpick &&
test_path_is_dir .git/sequencer &&
test_path_is_file .git/sequencer/head &&
test_path_is_file .git/sequencer/todo &&
--
1.7.4.1
next prev parent reply other threads:[~2011-12-14 16:55 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-09 15:41 [PATCH 0/9] Re-roll rr/revert-cherry-pick v2 Ramkumar Ramachandra
2011-12-09 15:41 ` [PATCH 1/9] revert: free msg in format_todo() Ramkumar Ramachandra
2011-12-09 15:41 ` [PATCH 2/9] revert: make commit subjects in insn sheet optional Ramkumar Ramachandra
2011-12-09 19:32 ` Jonathan Nieder
2011-12-09 15:42 ` [PATCH 3/9] revert: tolerate extra spaces, tabs in insn sheet Ramkumar Ramachandra
2011-12-09 19:40 ` Jonathan Nieder
2011-12-09 19:58 ` Ramkumar Ramachandra
2011-12-09 20:12 ` Junio C Hamano
2011-12-09 20:15 ` Ramkumar Ramachandra
2011-12-09 15:42 ` [PATCH 4/9] revert: simplify getting commit subject in format_todo() Ramkumar Ramachandra
2011-12-09 19:47 ` Jonathan Nieder
2011-12-09 20:58 ` Ramkumar Ramachandra
2011-12-09 15:42 ` [PATCH 5/9] t3510 (cherry-pick-sequencer): use exit status Ramkumar Ramachandra
2011-12-09 20:21 ` Jonathan Nieder
2011-12-09 20:36 ` Ramkumar Ramachandra
2011-12-09 21:00 ` Jonathan Nieder
2011-12-09 15:42 ` [PATCH 6/9] t3510 (cherry-pick-sequencer): remove malformed sheet 2 Ramkumar Ramachandra
2011-12-09 20:24 ` Jonathan Nieder
2011-12-09 20:30 ` Ramkumar Ramachandra
2011-12-09 20:37 ` Jonathan Nieder
2011-12-09 15:42 ` [PATCH 7/9] revert: allow mixed pick and revert instructions Ramkumar Ramachandra
2011-12-09 20:26 ` Jonathan Nieder
2011-12-09 15:42 ` [PATCH 8/9] revert: report fine-grained error messages from insn parser Ramkumar Ramachandra
2011-12-09 20:47 ` Jonathan Nieder
2011-12-09 15:42 ` [PATCH 9/9] revert: simplify communicating command-line arguments Ramkumar Ramachandra
2011-12-09 19:02 ` Jonathan Nieder
2011-12-09 19:11 ` Ramkumar Ramachandra
2011-12-09 19:29 ` Jonathan Nieder
2011-12-09 19:49 ` Ramkumar Ramachandra
2011-12-09 21:09 ` Jonathan Nieder
2011-12-09 20:34 ` [PATCH 0/9] Re-roll rr/revert-cherry-pick v2 Jonathan Nieder
2011-12-09 23:03 ` Ramkumar Ramachandra
2011-12-14 16:54 ` [PATCH 00/10] Re-roll rr/revert-cherry-pick v3 Ramkumar Ramachandra
2011-12-14 16:54 ` [PATCH 01/10] revert: free msg in format_todo() Ramkumar Ramachandra
2011-12-14 16:54 ` [PATCH 02/10] revert: make commit subjects in insn sheet optional Ramkumar Ramachandra
2011-12-14 16:54 ` [PATCH 03/10] revert: tolerate extra spaces, tabs in insn sheet Ramkumar Ramachandra
2011-12-14 16:54 ` [PATCH 04/10] revert: simplify getting commit subject in format_todo() Ramkumar Ramachandra
2011-12-14 16:54 ` [PATCH 05/10] t3510 (cherry-pick-sequencer): use exit status Ramkumar Ramachandra
2011-12-14 16:54 ` Ramkumar Ramachandra [this message]
2011-12-14 16:54 ` [PATCH 07/10] t3510 (cherry-pick-sequencer): remove malformed sheet 2 Ramkumar Ramachandra
2011-12-14 16:54 ` [PATCH 08/10] revert: move replay_action, replay_subcommand to header Ramkumar Ramachandra
2011-12-14 16:54 ` [PATCH 09/10] revert: allow mixed pick and revert instructions Ramkumar Ramachandra
2011-12-14 16:54 ` [PATCH 10/10] revert: report fine-grained error messages from insn parser Ramkumar Ramachandra
2011-12-15 21:23 ` Junio C Hamano
2011-12-15 23:18 ` Ramkumar Ramachandra
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=1323881677-11117-7-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@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).