push: allow --follow-tags to be set by config push.followTags
Signed-off-by: Dave Olszewski <cxreg@pobox.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
06c21e18ab
commit
a8bc269f11
@ -2079,6 +2079,12 @@ new default).
|
|||||||
|
|
||||||
--
|
--
|
||||||
|
|
||||||
|
push.followTags::
|
||||||
|
If set to true enable '--follow-tags' option by default. You
|
||||||
|
may override this configuration at time of push by specifying
|
||||||
|
'--no-follow-tags'.
|
||||||
|
|
||||||
|
|
||||||
rebase.stat::
|
rebase.stat::
|
||||||
Whether to show a diffstat of what changed upstream since the last
|
Whether to show a diffstat of what changed upstream since the last
|
||||||
rebase. False by default.
|
rebase. False by default.
|
||||||
|
@ -128,7 +128,10 @@ already exists on the remote side.
|
|||||||
Push all the refs that would be pushed without this option,
|
Push all the refs that would be pushed without this option,
|
||||||
and also push annotated tags in `refs/tags` that are missing
|
and also push annotated tags in `refs/tags` that are missing
|
||||||
from the remote but are pointing at commit-ish that are
|
from the remote but are pointing at commit-ish that are
|
||||||
reachable from the refs being pushed.
|
reachable from the refs being pushed. This can also be specified
|
||||||
|
with configuration variable 'push.followTags'. For more
|
||||||
|
information, see 'push.followTags' in linkgit:git-config[1].
|
||||||
|
|
||||||
|
|
||||||
--signed::
|
--signed::
|
||||||
GPG-sign the push request to update refs on the receiving
|
GPG-sign the push request to update refs on the receiving
|
||||||
|
@ -473,11 +473,21 @@ static int option_parse_recurse_submodules(const struct option *opt,
|
|||||||
|
|
||||||
static int git_push_config(const char *k, const char *v, void *cb)
|
static int git_push_config(const char *k, const char *v, void *cb)
|
||||||
{
|
{
|
||||||
|
int *flags = cb;
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
status = git_gpg_config(k, v, NULL);
|
status = git_gpg_config(k, v, NULL);
|
||||||
if (status)
|
if (status)
|
||||||
return status;
|
return status;
|
||||||
|
|
||||||
|
if (!strcmp(k, "push.followtags")) {
|
||||||
|
if (git_config_bool(k, v))
|
||||||
|
*flags |= TRANSPORT_PUSH_FOLLOW_TAGS;
|
||||||
|
else
|
||||||
|
*flags &= ~TRANSPORT_PUSH_FOLLOW_TAGS;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
return git_default_config(k, v, NULL);
|
return git_default_config(k, v, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2188,6 +2188,7 @@ _git_config ()
|
|||||||
pull.octopus
|
pull.octopus
|
||||||
pull.twohead
|
pull.twohead
|
||||||
push.default
|
push.default
|
||||||
|
push.followTags
|
||||||
rebase.autosquash
|
rebase.autosquash
|
||||||
rebase.stat
|
rebase.stat
|
||||||
receive.autogc
|
receive.autogc
|
||||||
|
Reference in New Issue
Block a user