Skip to content

Commit db9bb28

Browse files
pyokagangitster
authored andcommitted
pull: parse pull.ff as a bool or string
Since b814da8 (pull: add pull.ff configuration, 2014-01-15) git-pull supported setting --(no-)ff via the pull.ff configuration value. However, as it only matches the string values of "true" and "false", it does not support other boolean aliases such as "on", "off", "1", "0". This is inconsistent with the merge.ff setting, which supports these aliases. Fix this by using the bool_or_string_config function to retrieve the value of pull.ff. Signed-off-by: Paul Tan <[email protected]> Reviewed-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent eb8dc05 commit db9bb28

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-pull.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ then
5454
fi
5555

5656
# Setup default fast-forward options via `pull.ff`
57-
pull_ff=$(git config pull.ff)
57+
pull_ff=$(bool_or_string_config pull.ff)
5858
case "$pull_ff" in
5959
true)
6060
no_ff=--ff

0 commit comments

Comments
 (0)