Merge branch 'ly/run-builtin-use-passed-in-repo'
Code clean-up. * ly/run-builtin-use-passed-in-repo: git.c: remove the_repository dependence in run_builtin()
This commit is contained in:
4
git.c
4
git.c
@@ -462,12 +462,12 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv, struct
|
||||
precompose_argv_prefix(argc, argv, NULL);
|
||||
if (use_pager == -1 && run_setup &&
|
||||
!(p->option & DELAY_PAGER_CONFIG))
|
||||
use_pager = check_pager_config(the_repository, p->cmd);
|
||||
use_pager = check_pager_config(repo, p->cmd);
|
||||
if (use_pager == -1 && p->option & USE_PAGER)
|
||||
use_pager = 1;
|
||||
if (run_setup && startup_info->have_repository)
|
||||
/* get_git_dir() may set up repo, avoid that */
|
||||
trace_repo_setup(the_repository);
|
||||
trace_repo_setup(repo);
|
||||
commit_pager_choice();
|
||||
|
||||
if (!help && p->option & NEED_WORK_TREE)
|
||||
|
||||
Reference in New Issue
Block a user