From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jun 2015 18:02:12 +0000 (-0700)
Subject: Merge branch 'pt/pull-tags-error-diag' into maint
X-Git-Tag: v2.4.5~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6356003c80c744eefdd49d76bb587184d900228f?ds=inline;hp=-c

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
---

6356003c80c744eefdd49d76bb587184d900228f
diff --combined git-pull.sh
index 47d89c1fc7,30fc6f5f43..23781e5611
--- a/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