mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
merge-file: run setup_git_directory_gently() sooner
Part of a campaign to make repository-local configuration available early (simplifying the startup sequence for built-in commands). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
2bc8c1a8a6
commit
3668d42383
|
@ -28,7 +28,6 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
|
||||||
xmparam_t xmp = {{0}};
|
xmparam_t xmp = {{0}};
|
||||||
int ret = 0, i = 0, to_stdout = 0;
|
int ret = 0, i = 0, to_stdout = 0;
|
||||||
int quiet = 0;
|
int quiet = 0;
|
||||||
int nongit;
|
|
||||||
struct option options[] = {
|
struct option options[] = {
|
||||||
OPT_BOOLEAN('p', "stdout", &to_stdout, "send results to standard output"),
|
OPT_BOOLEAN('p', "stdout", &to_stdout, "send results to standard output"),
|
||||||
OPT_SET_INT(0, "diff3", &xmp.style, "use a diff3 based merge", XDL_MERGE_DIFF3),
|
OPT_SET_INT(0, "diff3", &xmp.style, "use a diff3 based merge", XDL_MERGE_DIFF3),
|
||||||
|
@ -50,8 +49,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
|
||||||
xmp.style = 0;
|
xmp.style = 0;
|
||||||
xmp.favor = 0;
|
xmp.favor = 0;
|
||||||
|
|
||||||
prefix = setup_git_directory_gently(&nongit);
|
if (startup_info->have_repository) {
|
||||||
if (!nongit) {
|
|
||||||
/* Read the configuration file */
|
/* Read the configuration file */
|
||||||
git_config(git_xmerge_config, NULL);
|
git_config(git_xmerge_config, NULL);
|
||||||
if (0 <= git_xmerge_style)
|
if (0 <= git_xmerge_style)
|
||||||
|
|
2
git.c
2
git.c
|
@ -350,7 +350,7 @@ static void handle_internal_command(int argc, const char **argv)
|
||||||
{ "mailsplit", cmd_mailsplit },
|
{ "mailsplit", cmd_mailsplit },
|
||||||
{ "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
|
{ "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
|
||||||
{ "merge-base", cmd_merge_base, RUN_SETUP },
|
{ "merge-base", cmd_merge_base, RUN_SETUP },
|
||||||
{ "merge-file", cmd_merge_file },
|
{ "merge-file", cmd_merge_file, RUN_SETUP_GENTLY },
|
||||||
{ "merge-index", cmd_merge_index, RUN_SETUP },
|
{ "merge-index", cmd_merge_index, RUN_SETUP },
|
||||||
{ "merge-ours", cmd_merge_ours, RUN_SETUP },
|
{ "merge-ours", cmd_merge_ours, RUN_SETUP },
|
||||||
{ "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
|
{ "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
|
||||||
|
|
Loading…
Reference in a new issue