Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'

diff --git a/builtin/apply.c b/builtin/apply.c
index f38c1f7b88fafa18550762685e3bb5b15bfa701f..470520bde7ceec8d01f401e7421927bd48fd69ee 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3606,11 +3606,11 @@ static int option_parse_directory(const struct option *opt,
        return 0;
 }
 
-int cmd_apply(int argc, const char **argv, const char *unused_prefix)
+int cmd_apply(int argc, const char **argv, const char *prefix_)
 {
        int i;
        int errs = 0;
-       int is_not_gitdir;
+       int is_not_gitdir = !startup_info->have_repository;
        int binary;
        int force_apply = 0;
 
@@ -3683,7 +3683,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
                OPT_END()
        };
 
-       prefix = setup_git_directory_gently(&is_not_gitdir);
+       prefix = prefix_;
        prefix_length = prefix ? strlen(prefix) : 0;
        git_config(git_apply_config, NULL);
        if (apply_default_whitespace)