diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-12-28 13:58:43 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-12-28 21:01:24 -0800 |
commit | 441ed4131b2d735fea08e4f6277c12b13acebd53 (patch) | |
tree | 2917389e22eb461c91e310e7a47df449986e785b /t/t3600-rm.sh | |
parent | git-sh-setup: document git_editor() and get_author_ident_from_commit() (diff) | |
download | tgif-441ed4131b2d735fea08e4f6277c12b13acebd53.tar.xz |
"git pull --tags": error out with a better message.
When "git pull --tags" is run without any other arguments, the
standard error message "You told me to fetch and merge stuff but
there is nothing to merge! You might want to fix your config"
is given.
While the error may be technically correct, fixing the config
would not help, as "git pull --tags" itself tells "git fetch"
not to use the configured refspecs.
This commit makes "git pull --tags" to issue a different error
message to avoid confusion. This is merely an interim solution.
In the longer term, it would be a better approach to change the
semantics of --tags option to make "git fetch" and "git pull"
to:
(1) behave as if no --tags was given (so an explicit refspec on
the command line overrides configured ones, or no explicit
refspecs on the command line takes configured ones); but
(2) no auto-following of tags is made even when using
configured refspecs; and
(3) fetch all tags as not-for-merge entries".
Then we would not need to have this separate error message, as
the ordinary merge will happen even with the --tags option.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3600-rm.sh')
0 files changed, 0 insertions, 0 deletions