diff options
author | Elijah Newren <newren@gmail.com> | 2021-07-22 08:04:50 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-07-22 21:54:30 +0300 |
commit | 6f843a3355ee590dfe09eb90679051e75fadf675 (patch) | |
tree | 2cd08ff9b4f2e00854a2ad665aa14734ecafd044 /t/t7601-merge-pull-config.sh | |
parent | 359ff6938990a438b99e95fe36b6b359f3eb9811 (diff) |
pull: fix handling of multiple heads
With multiple heads, we should not allow rebasing or fast-forwarding.
Make sure any fast-forward request calls out specifically the fact that
multiple branches are in play. Also, since we cannot fast-forward to
multiple branches, fix our computation of can_ff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7601-merge-pull-config.sh')
-rwxr-xr-x | t/t7601-merge-pull-config.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index 742ed3981c..1f652f433e 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -331,7 +331,7 @@ test_expect_success 'Multiple heads warns about inability to fast forward' ' test_i18ngrep "You have divergent branches" err ' -test_expect_failure 'Multiple can never be fast forwarded' ' +test_expect_success 'Multiple can never be fast forwarded' ' git reset --hard c0 && test_must_fail git -c pull.ff=only pull . c1 c2 c3 2>err && test_i18ngrep ! "You have divergent branches" err && |