Prepare 0.99.7 release candidate branch.

diff --git a/path.c b/path.c
index b85f087f4390f1235a6b9e9545b3f6dd8457fdd5..f788028a63dbd9b34563d2589697f4b5d65b8648 100644 (file)
--- a/path.c
+++ b/path.c
@@ -41,10 +41,12 @@ char *mkpath(const char *fmt, ...)
 
 char *git_path(const char *fmt, ...)
 {
-       const char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
+       const char *git_dir;
        va_list args;
        unsigned len;
 
+       git_dir = getenv(GIT_DIR_ENVIRONMENT);
+       if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
        len = strlen(git_dir);
        if (len > PATH_MAX-100)
                return bad_path;