From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 May 2015 19:41:56 +0000 (-0700)
Subject: Merge branch 'pt/pull-tags-error-diag'
X-Git-Tag: v2.5.0-rc0~85
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cc77b996120c548fd52799eee28c802358e260a7?ds=inline;hp=-c

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

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

cc77b996120c548fd52799eee28c802358e260a7
diff --combined git-pull.sh
index 9ed01fd219,30fc6f5f43..9005171b74
--- a/git-pull.sh
+++ b/git-pull.sh
@@@ -190,15 -190,6 +190,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
@@@ -240,7 -231,7 +231,7 @@@ test true = "$rebase" && 
  	if ! git rev-parse -q --verify HEAD >/dev/null
  	then
  		# On an unborn branch
 -		if test -f "$GIT_DIR/index"
 +		if test -f "$(git rev-parse --git-path index)"
  		then
  			die "$(gettext "updating an unborn branch with changes added to the index")"
  		fi
@@@ -323,6 -314,7 +314,6 @@@ the
  	fi
  fi
  
 -merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
  case "$rebase" in
  true)
  	eval="git-rebase $diffstat $strategy_args $merge_args $rebase_args $verbosity"
@@@ -333,7 -325,7 +324,7 @@@
  	eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only"
  	eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress"
  	eval="$eval $gpg_sign_args"
 -	eval="$eval \"\$merge_name\" HEAD $merge_head"
 +	eval="$eval FETCH_HEAD"
  	;;
  esac
  eval "exec $eval"