undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sergey Organov 2018-12-14 07:53:51 +03:00 committed by Junio C Hamano
parent 4d67b4e474
commit 1c320135e1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t3506-cherry-pick-ff.sh
View File

@ -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' '