From: Nicolas Morey-Chaisemartin Date: Wed, 6 Sep 2017 06:48:06 +0000 (+0200) Subject: pull: fix cli and config option parsing order X-Git-Tag: v2.15.0-rc0~84^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cad0c6928eae87dc8619b035e4eced5f2c662a12 pull: fix cli and config option parsing order pull parses first the cli options and then the config option. The expected behavior is the other way around, so that config options can not override the cli ones. This patch changes the parsing order so config options are parsed first. Signed-off-by: Nicolas Morey-Chaisemartin Signed-off-by: Junio C Hamano --- diff --git a/builtin/pull.c b/builtin/pull.c index 7fe281414e..9ef1ab5015 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -815,6 +815,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (!getenv("GIT_REFLOG_ACTION")) set_reflog_message(argc, argv); + git_config(git_pull_config, NULL); + argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0); parse_repo_refspecs(argc, argv, &repo, &refspecs); @@ -825,8 +827,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (opt_rebase < 0) opt_rebase = config_get_rebase(); - git_config(git_pull_config, NULL); - if (read_cache_unmerged()) die_resolve_conflict("pull");