fsck: give accurate error message on empty loose object files

[git.git] / builtin / merge-file.c

diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index b8e9e5ba01658bbdd6e9d712b00da902b6f33fbe..b6664d49be9454b703615af4e71f92231e053e07 100644 (file)
--- 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)