X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup.c;h=a45ea8309a9773160597f142f1208a6129885499;hb=9840906026be807d0882f96396de3a3cdb9fb43e;hp=cc97f9f5c1b8ebfb21a4487d4c5b0ee972797779;hpb=38ebbacd93eb547b3608b64a2efc60fd79e1ea85;p=git.git

diff --git a/setup.c b/setup.c
index cc97f9f5c..a45ea8309 100644
--- a/setup.c
+++ b/setup.c
@@ -95,6 +95,8 @@ void verify_non_filename(const char *prefix, const char *arg)
 	const char *name;
 	struct stat st;
 
+	if (is_inside_git_dir())
+		return;
 	if (*arg == '-')
 		return; /* flag */
 	name = prefix ? prefix_filename(prefix, strlen(prefix), arg) : arg;
@@ -168,6 +170,28 @@ static int is_git_directory(const char *suspect)
 	return 1;
 }
 
+static int inside_git_dir = -1;
+
+int is_inside_git_dir(void)
+{
+	if (inside_git_dir < 0) {
+		char buffer[1024];
+
+		if (is_bare_repository())
+			return (inside_git_dir = 1);
+		if (getcwd(buffer, sizeof(buffer))) {
+			const char *git_dir = get_git_dir(), *cwd = buffer;
+			while (*git_dir && *git_dir == *cwd) {
+				git_dir++;
+				cwd++;
+			}
+			inside_git_dir = !*git_dir;
+		} else
+			inside_git_dir = 0;
+	}
+	return inside_git_dir;
+}
+
 const char *setup_git_directory_gently(int *nongit_ok)
 {
 	static char cwd[PATH_MAX+1];
@@ -192,7 +216,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
 		die("Not a git repository: '%s'", gitdirenv);
 	}
 
-	if (!getcwd(cwd, sizeof(cwd)) || cwd[0] != '/')
+	if (!getcwd(cwd, sizeof(cwd)-1) || cwd[0] != '/')
 		die("Unable to read current working directory");
 
 	offset = len = strlen(cwd);
@@ -206,6 +230,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
 					if (chdir(cwd))
 						die("Cannot come back to cwd");
 					setenv(GIT_DIR_ENVIRONMENT, cwd, 1);
+					inside_git_dir = 1;
 					return NULL;
 				}
 				if (nongit_ok) {
@@ -226,6 +251,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
 	offset++;
 	cwd[len++] = '/';
 	cwd[len] = 0;
+	inside_git_dir = !prefixcmp(cwd + offset, ".git/");
 	return cwd + offset;
 }