t3506: validate '-m 1 -ff' is now accepted for non-merge commits

sorganov · gitster · commit 1c320135e12c · 2019-01-07T08:44:37.000-08:00
Signed-off-by: Sergey Organov &lt;sorganov@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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' '

Original file line number	Diff line number	Diff line change
`@@ -64,10 +64,10 @@ test_expect_success 'merge setup' '`
`64`	`64`	`git checkout -b new A`
`65`	`65`	`'`
`66`	`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`	`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`	`71`	`'`
`72`	`72`
`73`	`73`	`test_expect_success 'cherry pick a merge with --ff but without -m should fail' '`