diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:23 -0700 |
| commit | 7e46f27fa627c0f9f6f547bef53e5aa2de52dec5 (patch) | |
| tree | f34a803234c9560ed7e28f3459c948cd11b3f01b /t | |
| parent | Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint (diff) | |
| parent | pull: parse pull.ff as a bool or string (diff) | |
| download | tgif-7e46f27fa627c0f9f6f547bef53e5aa2de52dec5.tar.xz | |
Merge branch 'pt/pull-ff-vs-merge-ff' into maint
The pull.ff configuration was supposed to override the merge.ff
configuration, but it didn't.
* pt/pull-ff-vs-merge-ff:
pull: parse pull.ff as a bool or string
pull: make pull.ff=true override merge.ff
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7601-merge-pull-config.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index f768c900ab..c6c44ec570 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -45,6 +45,14 @@ test_expect_success 'fast-forward pull succeeds with "true" in pull.ff' ' test "$(git rev-parse HEAD)" = "$(git rev-parse c1)" ' +test_expect_success 'pull.ff=true overrides merge.ff=false' ' + git reset --hard c0 && + test_config merge.ff false && + test_config pull.ff true && + git pull . c1 && + test "$(git rev-parse HEAD)" = "$(git rev-parse c1)" +' + test_expect_success 'fast-forward pull creates merge with "false" in pull.ff' ' git reset --hard c0 && test_config pull.ff false && |