[PATCH v2 1/4] t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks
- From
Sergey Organov <sorganov@gmail.com>
- Date
- Dec 14, 2018, 04:53 UTC
- Message-ID
- <47bde24fd077a7f2a5a6db4c9bb9411c7255b89a.1544764226.git.sorganov@gmail.com>
- In-Reply-To
- <cover.1544762343.git.sorganov@gmail.com>
We are going to allow 'git cherry-pick -m 1' for non-merge commits, so this method to force failure will stop to work.
Use '-m 4' instead as it's very unlikely we will ever have such an octopus in this test setup.
Signed-off-by: Sergey Organov <sorganov@gmail.com> --- t/t3510-cherry-pick-sequence.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index c84eeef..941d502 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -61,7 +61,11 @@ 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 initial..anotherpick && + # to make sure that the session to cherry-pick a sequence + # gets interrupted, use a high-enough number that is larger + # than the number of parents of any commit we have created + mainline=4 && + test_expect_code 128 git cherry-pick -s -m $mainline --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 && @@ -69,7 +73,7 @@ test_expect_success 'cherry-pick persists opts correctly' ' echo "true" >expect && git config --file=.git/sequencer/opts --get-all options.signoff >actual && test_cmp expect actual && - echo "1" >expect && + echo "$mainline" >expect && git config --file=.git/sequencer/opts --get-all options.mainline >actual && test_cmp expect actual && echo "recursive" >expect &&
-- 2.10.0.1.g57b01a3