* [PATCH] builtin-tag.c: allow arguments in $EDITOR
@ 2007-12-19 23:23 Luciano Rocha
2007-12-20 9:57 ` [PATCH v2] " Luciano Rocha
0 siblings, 1 reply; 7+ messages in thread
From: Luciano Rocha @ 2007-12-19 23:23 UTC (permalink / raw
To: git
[-- Attachment #1: Type: text/plain, Size: 1449 bytes --]
The previous sh version of git-commit evaluated the value of the defined
editor, thus allowing arguments.
Make the builtin version work the same, by adding an explicit check for
arguments in the editor command, and extract them to an additional argument.
Signed-off-by: Luciano Rocha <luciano@eurotux.com>
---
builtin-tag.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
I personally use EDITOR="gvim -f", thus this patch.
Created on top of ce85b053d827e2f7c2ee2683cc09393e4768cc22,
git-describe is now: v1.5.4-rc0-75-g5f791e5
diff --git a/builtin-tag.c b/builtin-tag.c
index 274901a..57dcfe0 100644
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -46,7 +46,18 @@ void launch_editor(const char *path, struct strbuf *buffer, const char *const *e
if (!editor)
editor = "vi";
- if (strcmp(editor, ":")) {
+ if (strstr(editor, " -")) {
+ char *editor_cmd = xstrdup(editor);
+ char *editor_sep = strstr(editor_cmd, " -");
+ const char *args[] = { editor_cmd, editor_sep + 1,
+ path, NULL };
+
+ *editor_sep = '\0';
+
+ if (run_command_v_opt_cd_env(args, 0, NULL, env))
+ die("There was a problem with the editor %s.",
+ editor_cmd);
+ } else if (strcmp(editor, ":")) {
const char *args[] = { editor, path, NULL };
if (run_command_v_opt_cd_env(args, 0, NULL, env))
--
Luciano Rocha <luciano@eurotux.com>
Eurotux Informática, S.A. <http://www.eurotux.com/>
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2] builtin-tag.c: allow arguments in $EDITOR
2007-12-19 23:23 [PATCH] builtin-tag.c: allow arguments in $EDITOR Luciano Rocha
@ 2007-12-20 9:57 ` Luciano Rocha
2007-12-20 11:58 ` Johannes Schindelin
0 siblings, 1 reply; 7+ messages in thread
From: Luciano Rocha @ 2007-12-20 9:57 UTC (permalink / raw
To: git
The previous sh version of git-commit evaluated the value of the defined
editor, thus allowing arguments.
Make the builtin version work the same, by adding an explicit check for
arguments in the editor command, and extract them to an additional argument.
Signed-off-by: Luciano Rocha <luciano@eurotux.com>
---
builtin-tag.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
I personally use EDITOR="gvim -f", thus this patch.
Now with free() of temporary buffer.
diff --git a/builtin-tag.c b/builtin-tag.c
index 274901a..0e8575e 100644
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -46,7 +46,19 @@ void launch_editor(const char *path, struct strbuf *buffer, const char *const *e
if (!editor)
editor = "vi";
- if (strcmp(editor, ":")) {
+ if (strstr(editor, " -")) {
+ char *editor_cmd = xstrdup(editor);
+ char *editor_sep = strstr(editor_cmd, " -");
+ const char *args[] = { editor_cmd, editor_sep + 1,
+ path, NULL };
+
+ *editor_sep = '\0';
+
+ if (run_command_v_opt_cd_env(args, 0, NULL, env))
+ die("There was a problem with the editor %s.",
+ editor_cmd);
+ free(editor_cmd);
+ } else if (strcmp(editor, ":")) {
const char *args[] = { editor, path, NULL };
if (run_command_v_opt_cd_env(args, 0, NULL, env))
--
Luciano Rocha <luciano@eurotux.com>
Eurotux Informática, S.A. <http://www.eurotux.com/>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2] builtin-tag.c: allow arguments in $EDITOR
2007-12-20 9:57 ` [PATCH v2] " Luciano Rocha
@ 2007-12-20 11:58 ` Johannes Schindelin
2007-12-20 12:06 ` Luciano Rocha
2007-12-20 22:14 ` Junio C Hamano
0 siblings, 2 replies; 7+ messages in thread
From: Johannes Schindelin @ 2007-12-20 11:58 UTC (permalink / raw
To: Luciano Rocha; +Cc: git
Hi,
On Thu, 20 Dec 2007, Luciano Rocha wrote:
> The previous sh version of git-commit evaluated the value of the defined
> editor, thus allowing arguments.
>
> Make the builtin version work the same, by adding an explicit check for
> arguments in the editor command, and extract them to an additional
> argument.
Anything wrong with that patch?
http://article.gmane.org/gmane.comp.version-control.git/68444
Ciao,
Dscho
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] builtin-tag.c: allow arguments in $EDITOR
2007-12-20 11:58 ` Johannes Schindelin
@ 2007-12-20 12:06 ` Luciano Rocha
2007-12-20 22:14 ` Junio C Hamano
1 sibling, 0 replies; 7+ messages in thread
From: Luciano Rocha @ 2007-12-20 12:06 UTC (permalink / raw
To: Johannes Schindelin; +Cc: git
[-- Attachment #1: Type: text/plain, Size: 731 bytes --]
On Thu, Dec 20, 2007 at 12:58:59PM +0100, Johannes Schindelin wrote:
> Hi,
>
> On Thu, 20 Dec 2007, Luciano Rocha wrote:
>
> > The previous sh version of git-commit evaluated the value of the defined
> > editor, thus allowing arguments.
> >
> > Make the builtin version work the same, by adding an explicit check for
> > arguments in the editor command, and extract them to an additional
> > argument.
>
> Anything wrong with that patch?
>
> http://article.gmane.org/gmane.comp.version-control.git/68444
No, I just missed it in the mailing list. That patch also supports any
number of whitespace/arguments.
--
Luciano Rocha <luciano@eurotux.com>
Eurotux Informática, S.A. <http://www.eurotux.com/>
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] builtin-tag.c: allow arguments in $EDITOR
2007-12-20 11:58 ` Johannes Schindelin
2007-12-20 12:06 ` Luciano Rocha
@ 2007-12-20 22:14 ` Junio C Hamano
2007-12-21 0:33 ` Steven Grimm
2007-12-22 14:50 ` Johannes Schindelin
1 sibling, 2 replies; 7+ messages in thread
From: Junio C Hamano @ 2007-12-20 22:14 UTC (permalink / raw
To: Johannes Schindelin; +Cc: Luciano Rocha, git
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Anything wrong with that patch?
>
> http://article.gmane.org/gmane.comp.version-control.git/68444
I think Steven stopped after you poked holes in that patch.
The way scripted commands spawned editor is:
eval "${GIT_EDITOR:=vi}" '"$@"'
which meant that $IFS characters in $GIT_EDITOR separated words
and $environment_variables were substituted.
IOW, this is possible:
GIT_EDITOR='emacs -l $HOME/my-customization.el'
I think something like this patch is probably more appropriate.
It avoids potential bugs in splitting arguments by hand and lets the
shell deal with the issue.
---
builtin-tag.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/builtin-tag.c b/builtin-tag.c
index 274901a..fae2487 100644
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -47,7 +47,19 @@ void launch_editor(const char *path, struct strbuf *buffer, const char *const *e
editor = "vi";
if (strcmp(editor, ":")) {
- const char *args[] = { editor, path, NULL };
+ size_t len = strlen(editor);
+ int i = 0;
+ const char *args[6];
+
+ if (strcspn(editor, "$ \t'") != len) {
+ /* there are specials */
+ args[i++] = "sh";
+ args[i++] = "-c";
+ args[i++] = "$0 \"$@\"";
+ }
+ args[i++] = editor;
+ args[i++] = path;
+ args[i] = NULL;
if (run_command_v_opt_cd_env(args, 0, NULL, env))
die("There was a problem with the editor %s.", editor);
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2] builtin-tag.c: allow arguments in $EDITOR
2007-12-20 22:14 ` Junio C Hamano
@ 2007-12-21 0:33 ` Steven Grimm
2007-12-22 14:50 ` Johannes Schindelin
1 sibling, 0 replies; 7+ messages in thread
From: Steven Grimm @ 2007-12-21 0:33 UTC (permalink / raw
To: Junio C Hamano; +Cc: Johannes Schindelin, Luciano Rocha, git
On Dec 20, 2007, at 2:14 PM, Junio C Hamano wrote:
> I think Steven stopped after you poked holes in that patch.
Nah, just entered a particularly busy period in my day job and haven't
had time to do much more git stuff than occasionally skim the mailing
list. I do plan to revisit that at some point unless the patch in your
mail ends up being what we go with. (It seems like a sensible approach
to me.)
-Steve
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] builtin-tag.c: allow arguments in $EDITOR
2007-12-20 22:14 ` Junio C Hamano
2007-12-21 0:33 ` Steven Grimm
@ 2007-12-22 14:50 ` Johannes Schindelin
1 sibling, 0 replies; 7+ messages in thread
From: Johannes Schindelin @ 2007-12-22 14:50 UTC (permalink / raw
To: Junio C Hamano; +Cc: Luciano Rocha, git
Hi,
On Thu, 20 Dec 2007, Junio C Hamano wrote:
> I think something like this patch is probably more appropriate.
Looks obviously fine, especially thinking about this:
> GIT_EDITOR='emacs -l $HOME/my-customization.el'
Ciao,
Dscho
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-12-22 14:50 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-19 23:23 [PATCH] builtin-tag.c: allow arguments in $EDITOR Luciano Rocha
2007-12-20 9:57 ` [PATCH v2] " Luciano Rocha
2007-12-20 11:58 ` Johannes Schindelin
2007-12-20 12:06 ` Luciano Rocha
2007-12-20 22:14 ` Junio C Hamano
2007-12-21 0:33 ` Steven Grimm
2007-12-22 14:50 ` Johannes Schindelin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).