From: Sergey Organov Date: Fri, 14 Dec 2018 04:53:51 +0000 (+0300) Subject: t3506: validate '-m 1 -ff' is now accepted for non-merge commits X-Git-Tag: v2.21.0-rc0~87^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c320135e12c41d0f1ced7bd119c7ae0b65f307e;p=thirdparty%2Fgit.git t3506: validate '-m 1 -ff' is now accepted for non-merge commits Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- diff --git a/t/t3506-cherry-pick-ff.sh b/t/t3506-cherry-pick-ff.sh index fb889ac6f0..127dd0082f 100755 --- a/t/t3506-cherry-pick-ff.sh +++ b/t/t3506-cherry-pick-ff.sh @@ -64,10 +64,10 @@ test_expect_success 'merge setup' ' git checkout -b new A ' -test_expect_success 'cherry-pick a non-merge with --ff and -m should fail' ' +test_expect_success 'cherry-pick explicit first parent of a non-merge with --ff' ' git reset --hard A -- && - test_must_fail git cherry-pick --ff -m 1 B && - git diff --exit-code A -- + git cherry-pick --ff -m 1 B && + git diff --exit-code C -- ' test_expect_success 'cherry pick a merge with --ff but without -m should fail' '