diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-08-06 03:27:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-16 03:00:03 (GMT) |
| commit | 3668d4238314dc5db98de3034058f68ff57a6b1e (patch) | |
| tree | a7d5c5494e53eeeb7a2c8fc4a93dbd181cbcef59 | |
| parent | 2bc8c1a8a6b1cdffc19badc7272f552302b79d3e (diff) | |
| download | git-3668d4238314dc5db98de3034058f68ff57a6b1e.zip git-3668d4238314dc5db98de3034058f68ff57a6b1e.tar.gz git-3668d4238314dc5db98de3034058f68ff57a6b1e.tar.bz2 | |
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>
| -rw-r--r-- | builtin/merge-file.c | 4 | ||||
| -rw-r--r-- | git.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index b8e9e5b..b6664d4 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -28,7 +28,6 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) xmparam_t xmp = {{0}}; int ret = 0, i = 0, to_stdout = 0; int quiet = 0; - int nongit; struct option options[] = { 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), @@ -50,8 +49,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) xmp.style = 0; xmp.favor = 0; - prefix = setup_git_directory_gently(&nongit); - if (!nongit) { + if (startup_info->have_repository) { /* Read the configuration file */ git_config(git_xmerge_config, NULL); if (0 <= git_xmerge_style) @@ -350,7 +350,7 @@ static void handle_internal_command(int argc, const char **argv) { "mailsplit", cmd_mailsplit }, { "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE }, { "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-ours", cmd_merge_ours, RUN_SETUP }, { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, |