Merge branch 'maint'

diff --git a/path.c b/path.c
index 6395cf23098841c16d993ae7e86b2d8dcff01cd7..c4ce96236ae043b4d997536174936abb6ac40207 100644 (file)
--- a/path.c
+++ b/path.c
@@ -252,7 +252,7 @@ char *enter_repo(char *path, int strict)
 
        if (access("objects", X_OK) == 0 && access("refs", X_OK) == 0 &&
            validate_headref("HEAD") == 0) {
-               setenv("GIT_DIR", ".", 1);
+               setenv(GIT_DIR_ENVIRONMENT, ".", 1);
                check_repository_format();
                return path;
        }