diff options
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index b9e5c64ee8..be2b2c9ebc 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -363,7 +363,8 @@ static enum rebase_type config_get_rebase(int *rebase_unspecified) /** * Read config variables. */ -static int git_pull_config(const char *var, const char *value, void *cb) +static int git_pull_config(const char *var, const char *value, + const struct config_context *ctx, void *cb) { if (!strcmp(var, "rebase.autostash")) { config_autostash = git_config_bool(var, value); @@ -376,7 +377,7 @@ static int git_pull_config(const char *var, const char *value, void *cb) check_trust_level = 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value, ctx, cb); } /** |