1 files changed, 3 insertions, 2 deletions
diff --git a/setup.c b/setup.c
index 78a8041ff0..6b277b6a11 100644
--- a/setup.c
+++ b/setup.c
@@ -468,9 +468,10 @@ const char *setup_git_directory_gently(int *nongit_ok)
 				*nongit_ok = 1;
 				return NULL;
 			}
-			die("Not a git repository");
+			die("Not a git repository (or any of the parent directories): %s", DEFAULT_GIT_DIR_ENVIRONMENT);
 		}
-		chdir("..");
+		if (chdir(".."))
+			die("Cannot change to %s/..: %s", cwd, strerror(errno));
 	}
 
 	inside_git_dir = 0;