Merge branch 'pt/pull-tags-error-diag' into maint

There was a dead code that used to handle "git pull --tags" and
show special-cased error message, which was made irrelevant when
the semantics of the option changed back in Git 1.9 days.

* pt/pull-tags-error-diag:
pull: remove --tags error in no merge candidates case

diff --combined git-pull.sh
index 47d89c1fc73b0b8245632563db83017296af7a62,30fc6f5f43c1fcbd87cce8640640a986e16adfc8..23781e5611857548c448023d9fb291c371841278
--- 1/git-pull.sh
--- 2/git-pull.sh
+++ b/git-pull.sh
@@@ -54,11 -54,8 +54,11 @@@ the
  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
        ;;
@@@ -84,8 -81,8 +84,8 @@@ d
                diffstat=--no-stat ;;
        --stat|--summary)
                diffstat=--stat ;;
 -      --log|--no-log)
 -              log_arg=$1 ;;
 +      --log|--log=*|--no-log)
 +              log_arg="$1" ;;
        --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
                no_commit=--no-commit ;;
        --c|--co|--com|--comm|--commi|--commit)
@@@ -193,15 -190,6 +193,6 @@@ esa
  
  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