diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:06:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:06:01 -0700 |
| commit | 7d0daf3f12f87799a3b3f524933ef6c15d1f28c3 (patch) | |
| tree | eca75e171dba696509e72c6bdb2cc31fdce65529 /t/t5604-clone-reference.sh | |
| parent | The first batch post 2.33 (diff) | |
| parent | pull: fix handling of multiple heads (diff) | |
| download | tgif-7d0daf3f12f87799a3b3f524933ef6c15d1f28c3.tar.xz | |
Merge branch 'en/pull-conflicting-options'
"git pull" had various corner cases that were not well thought out
around its --rebase backend, e.g. "git pull --ff-only" did not stop
but went ahead and rebased when the history on other side is not a
descendant of our history. The series tries to fix them up.
* en/pull-conflicting-options:
pull: fix handling of multiple heads
pull: update docs & code for option compatibility with rebasing
pull: abort by default when fast-forwarding is not possible
pull: make --rebase and --no-rebase override pull.ff=only
pull: since --ff-only overrides, handle it first
pull: abort if --ff-only is given and fast-forwarding is impossible
t7601: add tests of interactions with multiple merge heads and config
t7601: test interaction of merge/rebase/fast-forward flags and options
Diffstat (limited to 't/t5604-clone-reference.sh')
| -rwxr-xr-x | t/t5604-clone-reference.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5604-clone-reference.sh b/t/t5604-clone-reference.sh index e845d621f6..24340e6d56 100755 --- a/t/t5604-clone-reference.sh +++ b/t/t5604-clone-reference.sh @@ -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 |