Skip to content

Commit 4d67b4e

Browse files
sorganovgitster
authored andcommitted
t3502: validate '-m 1' argument is now accepted for non-merge commits
Signed-off-by: Sergey Organov <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 37897bf commit 4d67b4e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/t3502-cherry-pick-merge.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ test_expect_success 'cherry-pick -m complains of bogus numbers' '
4040
test_expect_code 129 git cherry-pick -m 0 b
4141
'
4242

43-
test_expect_success 'cherry-pick a non-merge with -m should fail' '
43+
test_expect_success 'cherry-pick explicit first parent of a non-merge' '
4444
4545
git reset --hard &&
4646
git checkout a^0 &&
47-
test_expect_code 128 git cherry-pick -m 1 b &&
48-
git diff --exit-code a --
47+
git cherry-pick -m 1 b &&
48+
git diff --exit-code c --
4949
5050
'
5151

@@ -84,12 +84,12 @@ test_expect_success 'cherry pick a merge relative to nonexistent parent should f
8484
8585
'
8686

87-
test_expect_success 'revert a non-merge with -m should fail' '
87+
test_expect_success 'revert explicit first parent of a non-merge' '
8888
8989
git reset --hard &&
9090
git checkout c^0 &&
91-
test_must_fail git revert -m 1 b &&
92-
git diff --exit-code c
91+
git revert -m 1 b &&
92+
git diff --exit-code a --
9393
9494
'
9595

0 commit comments

Comments
 (0)