On Sun, Feb 15, 2009 at 02:51:45PM +0200, Felipe Contreras wrote:
> On Sun, Feb 15, 2009 at 2:33 PM, Johannes Schindelin
> <Johannes.Schindelin@xxxxxx> wrote:
> > Ah, I misremembered. Your current patch shows this:
> >
> > + else if (actions & ACTION_EDIT) {
> > + const char *config_filename;
> > + 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);
> > + }
> >
> > ... which makes me believe that the point about moving git_config() before
> > setting config_exclusive_filename is rather weak :-)
> >
> > + else if (actions & ACTION_EDIT) {
> > + git_config(git_default_config, NULL);
> > + launch_editor(config_exclusive_filename ?
> > + config_exclusive_filename : git_path("config"),
> > + NULL, NULL);
> > + }
> >
> > (This has whitespace issues, as I copy-pasted it using kterm's clipboard
> > functions.)
>
> I thought on that before but now it makes more sense to me. Attaching the patch.
Now inlined (sorry):
---
builtin-config.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/builtin-config.c b/builtin-config.c
index 2c1ad71..bd7bac4 100644
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -370,13 +370,10 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix)
}
else if (actions & ACTION_EDIT) {
check_argc(argc, 0, 0);
- const char *config_filename;
- 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);
}
else if (actions & ACTION_ADD) {
check_argc(argc, 2, 2);
--
1.6.1.3
--
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
