Commands requiring a work tree must not run in GIT_DIR

dscho · Junio C Hamano · commit 6d9ba67b0fc2 · 2007-02-05T14:02:16.000-08:00
This patch helps when you accidentally run something like git-clean
in the git directory instead of the work tree.

Signed-off-by: Johannes Schindelin &lt;Johannes.Schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/builtin-ls-files.c b/builtin-ls-files.c
@@ -323,7 +323,7 @@ static const char ls_files_usage[] =
 int cmd_ls_files(int argc, const char **argv, const char *prefix)
 {
 	int i;
-	int exc_given = 0;
+	int exc_given = 0, require_work_tree = 0;
 	struct dir_struct dir;
 
 	memset(&dir, 0, sizeof(dir));
@@ -363,14 +363,17 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
 		}
 		if (!strcmp(arg, "-m") || !strcmp(arg, "--modified")) {
 			show_modified = 1;
+			require_work_tree = 1;
 			continue;
 		}
 		if (!strcmp(arg, "-o") || !strcmp(arg, "--others")) {
 			show_others = 1;
+			require_work_tree = 1;
 			continue;
 		}
 		if (!strcmp(arg, "-i") || !strcmp(arg, "--ignored")) {
 			dir.show_ignored = 1;
+			require_work_tree = 1;
 			continue;
 		}
 		if (!strcmp(arg, "-s") || !strcmp(arg, "--stage")) {
@@ -379,6 +382,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
 		}
 		if (!strcmp(arg, "-k") || !strcmp(arg, "--killed")) {
 			show_killed = 1;
+			require_work_tree = 1;
 			continue;
 		}
 		if (!strcmp(arg, "--directory")) {
@@ -447,6 +451,10 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
 		break;
 	}
 
+	if (require_work_tree &&
+			(is_bare_repository() || is_inside_git_dir()))
+		die("This operation must be run in a work tree");
+
 	pathspec = get_pathspec(prefix, argv + i);
 
 	/* Verify that the pathspec matches the prefix */
diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
@@ -347,6 +347,11 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 				printf("%s/.git\n", cwd);
 				continue;
 			}
+			if (!strcmp(arg, "--is-inside-git-dir")) {
+				printf("%s\n", is_inside_git_dir() ? "true"
+						: "false");
+				continue;
+			}
 			if (!strncmp(arg, "--since=", 8)) {
 				show_datestring("--max-age=", arg+8);
 				continue;
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
@@ -48,7 +48,8 @@ cd_to_toplevel () {
 }
 
 require_work_tree () {
-	test $(is_bare_repository) = false ||
+	test $(is_bare_repository) = false &&
+	test $(git-rev-parse --is-inside-git-dir) = false ||
 	die "fatal: $0 cannot be used without a working tree."
 }
 
diff --git a/git.c b/git.c
@@ -299,8 +299,9 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
 			prefix = setup_git_directory();
 		if (p->option & USE_PAGER)
 			setup_pager();
-		if ((p->option & NOT_BARE) && is_bare_repository())
-			die("%s cannot be used in a bare git directory", cmd);
+		if ((p->option & NOT_BARE) &&
+				(is_bare_repository() || is_inside_git_dir()))
+			die("%s must be run in a work tree", cmd);
 		trace_argv_printf(argv, argc, "trace: built-in: git");
 
 		exit(p->fn(argc, argv, prefix));

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ static const char ls_files_usage[] =`
`323`	`323`	`int cmd_ls_files(int argc, const char *argv, const char prefix)`
`324`	`324`	`{`
`325`	`325`	`int i;`
`326`		`- int exc_given = 0;`
	`326`	`+ int exc_given = 0, require_work_tree = 0;`
`327`	`327`	`struct dir_struct dir;`
`328`	`328`
`329`	`329`	`memset(&dir, 0, sizeof(dir));`
`@@ -363,14 +363,17 @@ int cmd_ls_files(int argc, const char *argv, const char prefix)`
`363`	`363`	`}`
`364`	`364`	`if (!strcmp(arg, "-m") \|\| !strcmp(arg, "--modified")) {`
`365`	`365`	`show_modified = 1;`
	`366`	`+ require_work_tree = 1;`
`366`	`367`	`continue;`
`367`	`368`	`}`
`368`	`369`	`if (!strcmp(arg, "-o") \|\| !strcmp(arg, "--others")) {`
`369`	`370`	`show_others = 1;`
	`371`	`+ require_work_tree = 1;`
`370`	`372`	`continue;`
`371`	`373`	`}`
`372`	`374`	`if (!strcmp(arg, "-i") \|\| !strcmp(arg, "--ignored")) {`
`373`	`375`	`dir.show_ignored = 1;`
	`376`	`+ require_work_tree = 1;`
`374`	`377`	`continue;`
`375`	`378`	`}`
`376`	`379`	`if (!strcmp(arg, "-s") \|\| !strcmp(arg, "--stage")) {`
`@@ -379,6 +382,7 @@ int cmd_ls_files(int argc, const char *argv, const char prefix)`
`379`	`382`	`}`
`380`	`383`	`if (!strcmp(arg, "-k") \|\| !strcmp(arg, "--killed")) {`
`381`	`384`	`show_killed = 1;`
	`385`	`+ require_work_tree = 1;`
`382`	`386`	`continue;`
`383`	`387`	`}`
`384`	`388`	`if (!strcmp(arg, "--directory")) {`
`@@ -447,6 +451,10 @@ int cmd_ls_files(int argc, const char *argv, const char prefix)`
`447`	`451`	`break;`
`448`	`452`	`}`
`449`	`453`
	`454`	`+ if (require_work_tree &&`
	`455`	`+ (is_bare_repository() \|\| is_inside_git_dir()))`
	`456`	`+ die("This operation must be run in a work tree");`
	`457`	`+`
`450`	`458`	`pathspec = get_pathspec(prefix, argv + i);`
`451`	`459`
`452`	`460`	`/* Verify that the pathspec matches the prefix */`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ cd_to_toplevel () {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`require_work_tree () {`
`51`		`- test $(is_bare_repository) = false \|\|`
	`51`	`+ test $(is_bare_repository) = false &&`
	`52`	`+ test $(git-rev-parse --is-inside-git-dir) = false \|\|`
`52`	`53`	`die "fatal: $0 cannot be used without a working tree."`
`53`	`54`	`}`
`54`	`55`