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
This commit is contained in:
Junio C Hamano 2015-05-22 12:41:56 -07:00
Родитель fb257bfa17 19d122bf1b
Коммит cc77b99612
1 изменённых файлов: 0 добавлений и 9 удалений

Просмотреть файл

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