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://www.git.lorimer.id.au/gitweb.git/diff_plain/6356003c80c744eefdd49d76bb587184d900228f?hp=6998d890c7120fe2d30fa0b6f80ddfaad716f632

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 --git a/git-pull.sh b/git-pull.sh
index 47d89c1fc7..23781e5611 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -193,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