Code

t3502, t3510: clarify cherry-pick -m failure
authorRamkumar Ramachandra <artagnon@gmail.com>
Wed, 14 Dec 2011 16:54:33 +0000 (22:24 +0530)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Dec 2011 21:20:19 +0000 (13:20 -0800)
commitbf71009e5389aa2f3187ae9c0352ba3c70780f62
tree29402e01f632ed14122b555135a85996d47f20e7
parentc6b7c7f3050977577af49e5d81340fae3b5bf2e7
t3502, t3510: clarify cherry-pick -m failure

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3502-cherry-pick-merge.sh
t/t3510-cherry-pick-sequence.sh