diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-07-22 05:04:48 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-07-22 11:54:29 -0700 |
| commit | 031e2f7ae195069d00d21cde906fce5b0318dbdd (patch) | |
| tree | 61c6b5cb09f65ab91fe17c72c7cdfc5d8213c5f0 /t/t5521-pull-options.sh | |
| parent | pull: make --rebase and --no-rebase override pull.ff=only (diff) | |
| download | tgif-031e2f7ae195069d00d21cde906fce5b0318dbdd.tar.xz | |
pull: abort by default when fast-forwarding is not possible
We have for some time shown a long warning when the user does not
specify how to reconcile divergent branches with git pull. Make it an
error now.
Initial-patch-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5521-pull-options.sh')
| -rwxr-xr-x | t/t5521-pull-options.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh index 63a688bdbf..7601c919fd 100755 --- a/t/t5521-pull-options.sh +++ b/t/t5521-pull-options.sh @@ -113,7 +113,7 @@ test_expect_success 'git pull --force' ' git pull two && test_commit A && git branch -f origin && - git pull --all --force + git pull --no-rebase --all --force ) ' @@ -179,7 +179,7 @@ test_expect_success 'git pull --allow-unrelated-histories' ' ( cd dst && test_must_fail git pull ../src side && - git pull --allow-unrelated-histories ../src side + git pull --no-rebase --allow-unrelated-histories ../src side ) ' |