diff options
author | Elijah Newren <newren@gmail.com> | 2021-07-22 08:04:47 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-07-22 21:54:29 +0300 |
commit | adc27d6a9374d012b091bc348c20f5bfdbee52d1 (patch) | |
tree | ab53d1e016d9d40cb68ff97227c446addb670044 /t/t7601-merge-pull-config.sh | |
parent | e4dc25ed49d94c93b1d3f63efe17f32ca682cab7 (diff) |
pull: make --rebase and --no-rebase override pull.ff=only
Fix the last few precedence tests failing in t7601 by now implementing
the logic to have --[no-]rebase override a pull.ff=only config setting.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index d1f621725a..0c0dfecd2a 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -260,11 +260,11 @@ test_expect_success '--ff-only takes precedence over pull.rebase=false' ' test_attempts_fast_forward -c pull.rebase=false pull --ff-only ' -test_expect_failure '--no-rebase takes precedence over pull.ff=only' ' +test_expect_success '--no-rebase takes precedence over pull.ff=only' ' test_falls_back_to_full_merge -c pull.ff=only pull --no-rebase ' -test_expect_failure '--rebase takes precedence over pull.ff=only' ' +test_expect_success '--rebase takes precedence over pull.ff=only' ' test_does_rebase -c pull.ff=only pull --rebase ' |