Skip to content

Commit

Permalink
Merge branch 'pt/pull-tags-error-diag' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Jun 25, 2015
2 parents 6998d89 + 19d122b commit 6356003
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions git-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6356003

Please sign in to comment.