Sync with 2.3.10

diff --git a/git-pull.sh b/git-pull.sh
index 13e9d37efa61610e13d21f88325a045d276ec776..23781e5611857548c448023d9fb291c371841278 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -54,8 +54,11 @@ then
 fi
 
 # Setup default fast-forward options via `pull.ff`
-pull_ff=$(git config pull.ff)
+pull_ff=$(bool_or_string_config pull.ff)
 case "$pull_ff" in
+true)
+       no_ff=--ff
+       ;;
 false)
        no_ff=--no-ff
        ;;
@@ -190,15 +193,6 @@ esac
 
 error_on_no_merge_candidates () {
        exec >&2
-       for opt
-       do
-               case "$opt" in
-               -t|--t|--ta|--tag|--tags)
-                       echo "It doesn't make sense to pull all tags; you probably meant:"
-                       echo "  git fetch --tags"
-                       exit 1
-               esac
-       done
 
        if test true = "$rebase"
        then