git config: error when editing a repo config and not being in one

felipec · gitster · commit d212ca1724b1 · 2009-04-29T16:50:21.000-07:00
Let's throw an error on this specific case. If the user specifies the
config file, he must know what he is doing.

Teemu Likonen pointed this out.

Signed-off-by: Felipe Contreras &lt;felipe.contreras@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-config.c b/builtin-config.c
@@ -390,6 +390,8 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix)
 	}
 	else if (actions == ACTION_EDIT) {
 		check_argc(argc, 0, 0);
+		if (!config_exclusive_filename && nongit)
+			die("not in a git directory");
 		git_config(git_default_config, NULL);
 		launch_editor(config_exclusive_filename ?
 			      config_exclusive_filename : git_path("config"),

Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,8 @@ int cmd_config(int argc, const char *argv, const char unused_prefix)`
`390`	`390`	`}`
`391`	`391`	`else if (actions == ACTION_EDIT) {`
`392`	`392`	`check_argc(argc, 0, 0);`
	`393`	`+ if (!config_exclusive_filename && nongit)`
	`394`	`+ die("not in a git directory");`
`393`	`395`	`git_config(git_default_config, NULL);`
`394`	`396`	`launch_editor(config_exclusive_filename ?`
`395`	`397`	`config_exclusive_filename : git_path("config"),`