[PATCH v2 4/4] t3506: validate '-m 1 -ff' is now accepted for non-merge commits
From: Sergey Organov <hidden>
Date: 2018-12-14 13:05:57
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Sergey Organov <redacted> --- t/t3506-cherry-pick-ff.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t3506-cherry-pick-ff.sh b/t/t3506-cherry-pick-ff.sh
index fb889ac..127dd00 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' '
--
2.10.0.1.g57b01a3