From: Junio C Hamano <gitster@pobox.com>
To: Luke Diamand <luke@diamand.org>
Cc: git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>,
Chris Lasell <chrisl@pixar.com>
Subject: Re: [PATCH 2/2] git-p4: fix handling of multi-word P4EDITOR
Date: Thu, 07 May 2015 15:16:23 -0700 [thread overview]
Message-ID: <xmqqtwvom3t4.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <554BE15B.3040303@diamand.org> (Luke Diamand's message of "Thu, 07 May 2015 23:04:11 +0100")
Luke Diamand <luke@diamand.org> writes:
> On 07/05/15 22:16, Junio C Hamano wrote:
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>> i.e. the shell at the beginning of system sees "$customEditor"
>> (including the double quotes) as a quoted variable, expand the
>> environment variable as exported, and treat it as the path to
>> the program. Again untested but I think
>>
>> P4EDITOR="\"\$customEditor\"" &&
>
> Or will this work?
>
> - P4EDITOR="$TRASH_DIRECTORY/ed.sh" &&
> + P4EDITOR="\"$TRASH_DIRECTORY/ed.sh\"" &&
I wasn't sure TRASH_DIRECTORY was exported; as long as it is (and it
seems to be, from lib-test-functions.sh), that should be sufficient.
> I'm still a bit worried about what will happen to Windows users with
> this change though. I think the following avoids breaking Windows
> clients,...
>
> - system([editor, template_file])
> + system(shlex.split(editor) + [template_file])
>
> I've not tested it on anything other than Linux so far, so best not to
> merge yet!
Looking at run-command.c, GIT_WINDOES_NATIVE and POSIX seems to use
pretty much the same construct, except that they use SHELL_PATH
instead of "sh".
So something like this may be sufficient, perhaps?
Makefile | 1 +
git-p4.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 20058f1..fda44bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1776,6 +1776,7 @@ $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
$(SCRIPT_PYTHON_GEN): % : %.py
$(QUIET_GEN)$(RM) $@ $@+ && \
sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
+ -e 's|SHELL_PATH|$(SHELL_PATH_SQ)|g' \
$< >$@+ && \
chmod +x $@+ && \
mv $@+ $@
diff --git a/git-p4.py b/git-p4.py
index de06046..eb6d4b1 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1220,7 +1220,7 @@ class P4Submit(Command, P4UserMap):
editor = os.environ.get("P4EDITOR")
else:
editor = read_pipe("git var GIT_EDITOR").strip()
- system(["sh", "-c", ('%s "$@"' % editor), editor, template_file])
+ system(['''SHELL_PATH''', "-c", ('%s "$@"' % editor), editor, template_file])
# If the file was not saved, prompt to see if this patch should
# be skipped. But skip this verification step if configured so.
next prev parent reply other threads:[~2015-05-07 22:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-07 17:24 [PATCH 0/2] Re: Bug: git-p4 edit_template() and P4EDITOR w/options Luke Diamand
2015-05-07 17:25 ` [PATCH 1/2] git-p4: add failing test for P4EDITOR handling Luke Diamand
2015-05-07 17:25 ` [PATCH 2/2] git-p4: fix handling of multi-word P4EDITOR Luke Diamand
2015-05-07 18:11 ` Junio C Hamano
2015-05-07 19:27 ` Luke Diamand
2015-05-07 20:16 ` Junio C Hamano
2015-05-07 20:42 ` Luke Diamand
2015-05-07 21:06 ` Junio C Hamano
2015-05-07 21:16 ` Junio C Hamano
2015-05-07 22:04 ` Luke Diamand
2015-05-07 22:16 ` Junio C Hamano [this message]
2015-05-24 9:28 ` Luke Diamand
2015-05-26 20:21 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtwvom3t4.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=chrisl@pixar.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=luke@diamand.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).