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>

diff --git a/builtin-config.c b/builtin-config.c
index afc4393b17417c7418e20d06ced542418e39031c..d52a05744487182cfcd9e974ad1fb8c65e3eca89 100644 (file)
--- 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")) {
                } 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 (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);
                        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;
                        return 0;
                } else
                        break;