pull: remove --tags error in no merge candidates case
Since441ed41
("git pull --tags": error out with a better message., 2007-12-28), git pull --tags would print a different error message if git-fetch did not return any merge candidates: It doesn't make sense to pull all tags; you probably meant: git fetch --tags This is because at that time, git-fetch --tags would override any configured refspecs, and thus there would be no merge candidates. The error message was thus introduced to prevent confusion. However, sincec5a84e9
(fetch --tags: fetch tags *in addition to* other stuff, 2013-10-30), git fetch --tags would fetch tags in addition to any configured refspecs. Hence, if any no merge candidates situation occurs, it is not because --tags was set. As such, this special error message is now irrelevant. To prevent confusion, remove this error message. Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
3d4a3ffe64
commit
19d122bf1b
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user