[PATCH v7 1/2] git-pull.c: introduce git_pull_config()
- From
Mehul Jain <mehul.jain2029@gmail.com>
- Date
- Mar 9, 2016, 04:18 UTC
- Message-ID
- <1457497100-13045-1-git-send-email-mehul.jain2029@gmail.com>
- In-Reply-To
- <1456594902-21182-1-git-send-email-mehul.jain2029@gmail.com>
git-pull makes a seperate call to git_config_get_bool() to read the value of "rebase.autostash", this can be reduced as a call to git_config() is already there in the code.
Introduce a callback function git_pull_config() to read "rebase.autostash" along with other variables.
Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com> --- previous patches: $gname287709
This is a clean-up patch to add --[no-]autostash option to "git pull --rebase". builtin/pull.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c index 10eff03..8a318e9 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -86,6 +86,7 @@ static char *opt_commit; static char *opt_edit; static char *opt_ff; static char *opt_verify_signatures; +static int config_autostash = -1; static struct argv_array opt_strategies = ARGV_ARRAY_INIT; static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT; static char *opt_gpg_sign; @@ -304,6 +305,17 @@ static enum rebase_type config_get_rebase(void) return REBASE_FALSE; } +/** + * Read config variables. + */ +static int git_pull_config(const char *var, const char *value, void *cb) +{ + if (!strcmp(var, "rebase.autostash")) { + config_autostash = git_config_bool(var, value); + return 0; + } + return git_default_config(var, value, cb); +} /** * Returns 1 if there are unstaged changes, 0 otherwise. @@ -823,7 +835,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (opt_rebase < 0) opt_rebase = config_get_rebase(); - git_config(git_default_config, NULL); + git_config(git_pull_config, NULL); if (read_cache_unmerged()) die_resolve_conflict("Pull"); @@ -835,13 +847,11 @@ int cmd_pull(int argc, const char **argv, const char *prefix) hashclr(orig_head); if (opt_rebase) { - int autostash = 0; if (is_null_sha1(orig_head) && !is_cache_unborn()) die(_("Updating an unborn branch with changes added to the index.")); - git_config_get_bool("rebase.autostash", &autostash); - if (!autostash) + if (config_autostash != 1) die_on_unclean_work_tree(prefix); if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs))
-- 2.7.1.340.g69eb491.dirty