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>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ae6791db128130080915bf127cfa66b850921f43..e01d21cda2811badd7395e68f6c29341c9355eda 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -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::
        Whether to show a diffstat of what changed upstream since the last
        rebase. False by default.
 rebase.stat::
        Whether to show a diffstat of what changed upstream since the last
        rebase. False by default.

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index ea9757692ac6fa7f58eb8a150f9eef9e30875333..caa187be06d813606fdddfb1f56bd59609898010 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -128,7 +128,10 @@ already exists on the remote side.
        Push all the refs that would be pushed without this option,
        and also push annotated tags in `refs/tags` that are missing
        from the remote but are pointing at commit-ish that are
        Push all the refs that would be pushed without this option,
        and also push annotated tags in `refs/tags` that are missing
        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::
        GPG-sign the push request to update refs on the receiving
 
 --signed::
        GPG-sign the push request to update refs on the receiving

diff --git a/builtin/push.c b/builtin/push.c
index bba22b86b9b660d6b8bac62a303c07a3dff862d1..57c138bd7bc972bfa337de4c615cbfffb99ecc71 100644 (file)
--- 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)
 {
 
 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;
        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);
 }
 
        return git_default_config(k, v, NULL);
 }
 

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c21190d7510c173482b7784f9e8c4bf0b56cb1e1..cffb2b8d66c624b1267a512ca09a5fe6b62293fa 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2188,6 +2188,7 @@ _git_config ()
                pull.octopus
                pull.twohead
                push.default
                pull.octopus
                pull.twohead
                push.default

+               push.followTags

                rebase.autosquash
                rebase.stat
                receive.autogc
                rebase.autosquash
                rebase.stat
                receive.autogc