mirror of
https://github.com/git/git
synced 2024-08-28 03:59:25 +00:00
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:
commit
cc77b99612
|
@ -190,15 +190,6 @@ esac
|
||||||
|
|
||||||
error_on_no_merge_candidates () {
|
error_on_no_merge_candidates () {
|
||||||
exec >&2
|
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"
|
if test true = "$rebase"
|
||||||
then
|
then
|
||||||
|
|
Loading…
Reference in a new issue