mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
4d67b4e474
commit
1c320135e1
|
@ -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' '
|
||||
|
|
Loading…
Reference in a new issue