Merge branch 'sb/line-log-plug-pairdiff-leak'

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)
 {
+       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);
 }