From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 21 Feb 2009 00:48:54 +0000 (+0200)
Subject: git config: trivial cleanup for editor action
X-Git-Tag: v1.6.3-rc0~205^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/414f2e5337b0b78a47f021cb734e9ba4934c0b28?hp=--cc

git config: trivial cleanup for editor action

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

414f2e5337b0b78a47f021cb734e9ba4934c0b28
diff --git a/builtin-config.c b/builtin-config.c
index afc4393b17..d52a057444 100644
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -363,15 +363,12 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		} else if (!strcmp(argv[1], "--get-colorbool")) {
 			return get_colorbool(argc-2, argv+2);
 		} else if (!strcmp(argv[1], "--edit") || !strcmp(argv[1], "-e")) {
-			const char *config_filename;
 			if (argc != 2)
 				usage(git_config_set_usage);
-			if (config_exclusive_filename)
-				config_filename = config_exclusive_filename;
-			else
-				config_filename = git_path("config");
 			git_config(git_default_config, NULL);
-			launch_editor(config_filename, NULL, NULL);
+			launch_editor(config_exclusive_filename ?
+				      config_exclusive_filename : git_path("config"),
+				      NULL, NULL);
 			return 0;
 		} else
 			break;