summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4b951b7)
raw | patch | inline | side by side (parent: 4b951b7)
author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
Sat, 21 Feb 2009 00:48:54 +0000 (02:48 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 22 Feb 2009 04:35:48 +0000 (20:35 -0800) |
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-config.c | patch | blob | history |
diff --git a/builtin-config.c b/builtin-config.c
index afc4393b17417c7418e20d06ced542418e39031c..d52a05744487182cfcd9e974ad1fb8c65e3eca89 100644 (file)
--- a/builtin-config.c
+++ b/builtin-config.c
} 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;