Merge branch 'ah/advise-force-pushing'

[thirdparty/git.git] / builtin / push.c

diff --git a/builtin/push.c b/builtin/push.c
index 61a251c50aa4eb31010ca986b48e4cc71e517166..f05d2e29bc20e6af0f309c0ef819113446f5cc49 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -509,7 +509,8 @@ static void set_push_cert_flags(int *flags, int v)
 }
 
 
-static int git_push_config(const char *k, const char *v, void *cb)
+static int git_push_config(const char *k, const char *v,
+                          const struct config_context *ctx, void *cb)
 {
        const char *slot_name;
        int *flags = cb;
@@ -576,7 +577,7 @@ static int git_push_config(const char *k, const char *v, void *cb)
                return 0;
        }
 
-       return git_default_config(k, v, NULL);
+       return git_default_config(k, v, ctx, NULL);
 }
 
 int cmd_push(int argc, const char **argv, const char *prefix)