pull: make pull.ff=true override merge.ff
Since b814da8 (pull: add pull.ff configuration, 2014-01-15), running git-pull with the configuration pull.ff=false or pull.ff=only is equivalent to passing --no-ff and --ff-only to git-merge. However, if pull.ff=true, no switch is passed to git-merge. This leads to the confusing behavior where pull.ff=false or pull.ff=only is able to override merge.ff, while pull.ff=true is unable to. Fix this by adding the --ff switch if pull.ff=true, and add a test to catch future regressions. Furthermore, clarify in the documentation that pull.ff overrides merge.ff. Signed-off-by: Paul Tan <pyokagan@gmail.com> Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Paul Tan committed
May 18, 2015 at 21:45 UTC
eb8dc05c3d364174a6b694e2850ffd6cfe32c6d3
3 files changed
+12
-1
Documentation/config.txt
+1
-1
@@ -2033,7 +2033,7 @@ pull.ff::
2033
a case (equivalent to giving the `--no-ff` option from the command
2034
line). When set to `only`, only such fast-forward merges are
2035
allowed (equivalent to giving the `--ff-only` option from the
2036
- command line).
2036
+ command line). This setting overrides `merge.ff` when pulling.
2037
2038
pull.rebase::
2039
When true, rebase branches on top of the fetched branch, instead
git-pull.sh
+3
@@ -56,6 +56,9 @@ fi
56
# Setup default fast-forward options via `pull.ff`
57
pull_ff=$(git config pull.ff)
58
case "$pull_ff" in
59
+true)
60
+ no_ff=--ff
61
+ ;;
62
false)
63
no_ff=--no-ff
64
;;
t/t7601-merge-pull-config.sh
+8
@@ -45,6 +45,14 @@ test_expect_success 'fast-forward pull succeeds with "true" in pull.ff' '
45
test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
46
'
47
48
+test_expect_success 'pull.ff=true overrides merge.ff=false' '
49
+ git reset --hard c0 &&
50
+ test_config merge.ff false &&
51
+ test_config pull.ff true &&
52
+ git pull . c1 &&
53
+ test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
54
+'
55
+
56
test_expect_success 'fast-forward pull creates merge with "false" in pull.ff' '
57
git reset --hard c0 &&
58
test_config pull.ff false &&