summaryrefslogtreecommitdiff
path: root/builtin/revert.c
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2011-12-14 16:54:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-15 21:20:19 (GMT)
commitbf71009e5389aa2f3187ae9c0352ba3c70780f62 (patch)
tree29402e01f632ed14122b555135a85996d47f20e7 /builtin/revert.c
parentc6b7c7f3050977577af49e5d81340fae3b5bf2e7 (diff)
downloadgit-bf71009e5389aa2f3187ae9c0352ba3c70780f62.zip
git-bf71009e5389aa2f3187ae9c0352ba3c70780f62.tar.gz
git-bf71009e5389aa2f3187ae9c0352ba3c70780f62.tar.bz2
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>
Diffstat (limited to 'builtin/revert.c')
0 files changed, 0 insertions, 0 deletions