t3506: validate '-m 1 -ff' is now accepted for non-merge commits
Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Dec 14, 2018 at 07:53 UTC
1c320135e12c41d0f1ced7bd119c7ae0b65f307e
1 file changed
+3
-3
t/t3506-cherry-pick-ff.sh
+3
-3
@@ -64,10 +64,10 @@ test_expect_success 'merge setup' '
64
git checkout -b new A
65
'
66
67
-test_expect_success 'cherry-pick a non-merge with --ff and -m should fail' '
67
+test_expect_success 'cherry-pick explicit first parent of a non-merge with --ff' '
68
git reset --hard A -- &&
69
- test_must_fail git cherry-pick --ff -m 1 B &&
70
- git diff --exit-code A --
69
+ git cherry-pick --ff -m 1 B &&
70
+ git diff --exit-code C --
71
'
72
73
test_expect_success 'cherry pick a merge with --ff but without -m should fail' '