Eleventh batch for 2.14

diff --git a/environment.c b/environment.c
index 9d9b367925d7d517b2240b8d59d8ca802452823e..d40b21fb72168f32f1aaeac553347859e32f90c0 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -170,7 +170,7 @@ static void setup_git_env(void)
        git_dir = getenv(GIT_DIR_ENVIRONMENT);
        if (!git_dir) {
                if (!startup_info->have_repository)
-                       die("BUG: setup_git_env called without repository");
+                       BUG("setup_git_env called without repository");
                git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
        }
        gitfile = read_gitfile(git_dir);
@@ -218,6 +218,8 @@ const char *get_git_dir(void)
 
 const char *get_git_common_dir(void)
 {
+       if (!git_dir)
+               setup_git_env();
        return git_common_dir;
 }