mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pull: abort by default when fast-forwarding is not possible

Browse Source 
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>
This commit is contained in:
Elijah Newren
2021-07-22 05:04:48 +00:00
committed by Junio C Hamano
parent adc27d6a93
commit 031e2f7ae1
13 changed files with 83 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t5604-clone-reference.sh
View File

@ -87,7 +87,7 @@ test_expect_success 'updating origin' '
'
test_expect_success 'pulling changes from origin' '
git -C C pull origin
git -C C pull --no-rebase origin
'
# the 2 local objects are commit and tree from the merge
@ -96,7 +96,7 @@ test_expect_success 'that alternate to origin gets used' '
'
test_expect_success 'pulling changes from origin' '
git -C D pull origin
git -C D pull --no-rebase origin
'
# the 5 local objects are expected; file3 blob, commit in A to add it