diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-05-13 18:06:47 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-05-14 09:52:51 -0700 |
| commit | 19d122bf1b119a759267076fead332fb857af87e (patch) | |
| tree | 5ef32d5a6a6b1cf1447120e3c5c04b093c09953e | |
| parent | Git 2.4 (diff) | |
| download | tgif-19d122bf1b119a759267076fead332fb857af87e.tar.xz | |
pull: remove --tags error in no merge candidates case
Since 441ed41 ("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, since c5a84e9 (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>
| -rwxr-xr-x | git-pull.sh | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/git-pull.sh b/git-pull.sh index 4d4fc77b05..30fc6f5f43 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 |