diff options
| author | Sergey Organov <sorganov@gmail.com> | 2018-12-14 07:53:51 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-07 19:44:37 +0300 |
| commit | 1c320135e12c41d0f1ced7bd119c7ae0b65f307e (patch) | |
| tree | 734c10d38860b9122ce04968aab2b1911d56a607 /t/t3506-cherry-pick-ff.sh | |
| parent | 4d67b4e4740895ddc5b8bd4f205e159999c1b974 (diff) | |
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>
Diffstat (limited to 't/t3506-cherry-pick-ff.sh')
| -rwxr-xr-x | t/t3506-cherry-pick-ff.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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' ' |