File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -40,12 +40,12 @@ test_expect_success 'cherry-pick -m complains of bogus numbers' '
40
40
test_expect_code 129 git cherry-pick -m 0 b
41
41
'
42
42
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 ' '
44
44
45
45
git reset --hard &&
46
46
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 --
49
49
50
50
'
51
51
@@ -84,12 +84,12 @@ test_expect_success 'cherry pick a merge relative to nonexistent parent should f
84
84
85
85
'
86
86
87
- test_expect_success ' revert a non-merge with -m should fail ' '
87
+ test_expect_success ' revert explicit first parent of a non-merge ' '
88
88
89
89
git reset --hard &&
90
90
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 --
93
93
94
94
'
95
95
You can’t perform that action at this time.
0 commit comments