diff -p: squelch "diff --git" header for stat-dirty paths

[git.git] / setup.c

diff --git a/setup.c b/setup.c
index d19aa7d7a9633eaf8bb7d65d31bad6b67bf85ead..a3b76de2bb1c18e2f3b8cdf5799c3c650b16d027 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -426,7 +426,7 @@ static dev_t get_device_or_die(const char *path, const char *prefix)
  * We cannot decide in this function whether we are in the work tree or
  * not, since the config can only be read _after_ this function was called.
  */
-const char *setup_git_directory_gently(int *nongit_ok)
+static const char *setup_git_directory_gently_1(int *nongit_ok)
 {
        const char *work_tree_env = getenv(GIT_WORK_TREE_ENVIRONMENT);
        const char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT);
@@ -507,6 +507,16 @@ const char *setup_git_directory_gently(int *nongit_ok)
        }
 }
 
+const char *setup_git_directory_gently(int *nongit_ok)
+{
+       const char *prefix;
+
+       prefix = setup_git_directory_gently_1(nongit_ok);
+       if (startup_info)
+               startup_info->have_repository = !nongit_ok || !*nongit_ok;
+       return prefix;
+}
+
 int git_config_perm(const char *var, const char *value)
 {
        int i;