diff options
| author | Elijah Newren <newren@gmail.com> | 2021-07-22 08:04:48 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-22 21:54:29 +0300 |
| commit | 031e2f7ae195069d00d21cde906fce5b0318dbdd (patch) | |
| tree | 61c6b5cb09f65ab91fe17c72c7cdfc5d8213c5f0 /t/t5524-pull-msg.sh | |
| parent | adc27d6a9374d012b091bc348c20f5bfdbee52d1 (diff) | |
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/t5524-pull-msg.sh')
| -rwxr-xr-x | t/t5524-pull-msg.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh index c278adaa5a..b2be3605f5 100755 --- a/t/t5524-pull-msg.sh +++ b/t/t5524-pull-msg.sh @@ -28,7 +28,7 @@ test_expect_success setup ' test_expect_success pull ' ( cd cloned && - git pull --log && + git pull --no-rebase --log && git log -2 && git cat-file commit HEAD >result && grep Dollar result @@ -41,7 +41,7 @@ test_expect_success '--log=1 limits shortlog length' ' git reset --hard HEAD^ && test "$(cat afile)" = original && test "$(cat bfile)" = added && - git pull --log=1 && + git pull --no-rebase --log=1 && git log -3 && git cat-file commit HEAD >result && grep Dollar result && |