summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Dave Olszewski <cxreg@pobox.com>2015-02-16 01:16:19 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-14 15:08:35 -0700
commita8bc269f11b34e60f5fdbd8e831a654dd6b6b67e (patch)
tree619d895a2393bcbc8bdfe9a383af60d565086eb6 /builtin
parentcmd_push: pass "flags" pointer to config callback (diff)
downloadtgif-a8bc269f11b34e60f5fdbd8e831a654dd6b6b67e.tar.xz
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>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/push.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/builtin/push.c b/builtin/push.c
index bba22b86b9..57c138bd7b 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -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)
{
+ int *flags = cb;
int status;
status = git_gpg_config(k, v, NULL);
if (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);
}