mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
c6b7c7f305
commit
bf71009e53
|
@ -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 --
|
||||
|
||||
'
|
||||
|
|
|
@ -67,7 +67,7 @@ test_expect_success 'cherry-pick mid-cherry-pick-sequence' '
|
|||
|
||||
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 &&
|
||||
|
|
Loading…
Reference in a new issue