diff options
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 880eebcdd6..5405d09f22 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -9,6 +9,8 @@ #include "cache.h" #include "config.h" #include "builtin.h" +#include "gettext.h" +#include "hex.h" #include "parse-options.h" #include "exec-cmd.h" #include "run-command.h" @@ -359,8 +361,6 @@ static enum rebase_type config_get_rebase(int *rebase_unspecified) */ static int git_pull_config(const char *var, const char *value, void *cb) { - int status; - if (!strcmp(var, "rebase.autostash")) { config_autostash = git_config_bool(var, value); return 0; @@ -372,10 +372,6 @@ static int git_pull_config(const char *var, const char *value, void *cb) check_trust_level = 0; } - status = git_gpg_config(var, value, cb); - if (status) - return status; - return git_default_config(var, value, cb); } |
