For some reason, the construct
sh -c "$0 \"$@\"" <editor> <file>
does not pick up quotes in <editor> as expected. So replace $0 with
<editor>.
This fixes
git config core.editor '"c:/Program Files/What/Ever.exe"'
In other words, you can specify an editor with spaces in its path using a
config containing something like this:
[core]
editor = \"c:/Program Files/Darn/Spaces.exe\"
NOTE: we cannot just replace the $0 with \"$0\", because we still want
this to work:
[core]
editor = emacs -nw
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
On Mon, 10 Mar 2008, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
>
> > For some reason, the construct
> >
> > sh -c "$0 \"$@\"" <editor> <file>
> >
> > does not pick up quotes in <editor> as expected. So replace
> > $0 with <editor>.
> >
> > This fixes
> >
> > git config core.editor "c:/Program Files/What/Ever.exe"
>
> Ah, I misread your patch. The above example needs to be fixed
> as discussed, but what the patch does to builtin-tag.c is fine.
Here comes the fixed commit message and...
> > diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
> > index c1cec55..5395b74 100755
> > --- a/t/t7005-editor.sh
> > +++ b/t/t7005-editor.sh
> > @@ -89,6 +89,34 @@ do
> > '
> > done
> >
> > +test_expect_success 'editor with a space' '
> > +
> > + if echo "echo space > \"\$1\"" > "e space.sh"
> > + then
> > + chmod a+x "e space.sh" &&
> > + GIT_EDITOR="./e\ space.sh" \
> > + git --exec-path=. commit --amend &&
>
> Why do you need --exec-path=. to tell the newly built git to
> find its subcommands from t/trash directory, when you give an explicit
> instruction to find GIT_EDITOR in "./"?
... the fixed tests.
I copied this piece from the earlier tests. Probably it is only
needed to avoid "vi" from being found in the PATH (--exec-path's argument
is prepended to the PATH).
builtin-tag.c | 6 +++++-
t/t7005-editor.sh | 27 +++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/builtin-tag.c b/builtin-tag.c
index 28c36fd..8dd959f 100644
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -50,12 +50,15 @@ void launch_editor(const char *path, struct strbuf *buffer, const char *const *e
size_t len = strlen(editor);
int i = 0;
const char *args[6];
+ struct strbuf arg0;
+ strbuf_init(&arg0, 0);
if (strcspn(editor, "$ \t'") != len) {
/* there are specials */
+ strbuf_addf(&arg0, "%s \"$@\"", editor);
args[i++] = "sh";
args[i++] = "-c";
- args[i++] = "$0 \"$@\"";
+ args[i++] = arg0.buf;
}
args[i++] = editor;
args[i++] = path;
@@ -63,6 +66,7 @@ void launch_editor(const char *path, struct strbuf *buffer, const char *const *e
if (run_command_v_opt_cd_env(args, 0, NULL, env))
die("There was a problem with the editor %s.", editor);
+ strbuf_release(&arg0);
}
if (!buffer)
diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index c1cec55..6a74b3a 100755
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -89,6 +89,33 @@ do
'
done
+test_expect_success 'editor with a space' '
+
+ if echo "echo space > \"\$1\"" > "e space.sh"
+ then
+ chmod a+x "e space.sh" &&
+ GIT_EDITOR="./e\ space.sh" git commit --amend &&
+ test space = "$(git show -s --pretty=format:%s)"
+ else
+ say "Skipping; FS does not support spaces in filenames"
+ fi
+
+'
+
+unset GIT_EDITOR
+test_expect_success 'core.editor with a space' '
+
+ if test -f "e space.sh"
+ then
+ git config core.editor \"./e\ space.sh\" &&
+ git commit --amend &&
+ test space = "$(git show -s --pretty=format:%s)"
+ else
+ say "Skipping; FS does not support spaces in filenames"
+ fi
+
+'
+
TERM="$OLD_TERM"
test_done
--
1.5.4.4.643.g7cb9b.dirty
--
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
