Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursive

diff --git a/environment.c b/environment.c
index ff6e4f06e93d642aa53ba1812c3788b0ccad092e..560408953c8f76a30a093a59505e52c828d8d20b 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -217,6 +217,8 @@ const char *get_git_dir(void)
 
 const char *get_git_common_dir(void)
 {
+       if (!git_dir)
+               setup_git_env();
        return git_common_dir;
 }