summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-22 19:41:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-22 19:41:56 (GMT)
commitcc77b996120c548fd52799eee28c802358e260a7 (patch)
tree5769811c5666798bc619753b5ca3f6f287c0a791
parentfb257bfa174b00e236ac5d6f4282a487f10a9e98 (diff)
parent19d122bf1b119a759267076fead332fb857af87e (diff)
downloadgit-cc77b996120c548fd52799eee28c802358e260a7.zip
git-cc77b996120c548fd52799eee28c802358e260a7.tar.gz
git-cc77b996120c548fd52799eee28c802358e260a7.tar.bz2
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
-rwxr-xr-xgit-pull.sh9
1 files changed, 0 insertions, 9 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 9ed01fd..9005171 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -190,15 +190,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