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 14:16:22 -0700 [thread overview]
Message-ID: <xmqq3838nl5l.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqa8xgnlme.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Thu, 07 May 2015 14:06:17 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Perhaps something like this would work (totally untested)?
>
> diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh
> index 8931188..a47b44b 100755
> --- a/t/t9805-git-p4-skip-submit-edit.sh
> +++ b/t/t9805-git-p4-skip-submit-edit.sh
> @@ -90,8 +90,9 @@ test_expect_success 'no config, edited' '
> cd "$git" &&
> echo line >>file1 &&
> git commit -a -m "change 5" &&
> - P4EDITOR="$TRASH_DIRECTORY/ed.sh" &&
> - export P4EDITOR &&
> + customEditor="$TRASH_DIRECTORY/ed.sh" &&
> + P4EDITOR="\$customEditor" &&
Sorry, this inside should be quoted a bit more so that the executed
command becomes
sh -c '"$customEditor" "$@"'
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\"" &&
should do the work.
> + export customEditor P4EDITOR &&
> git p4 submit &&
> p4 changes //depot/... >wc &&
> test_line_count = 5 wc
next prev parent reply other threads:[~2015-05-07 21: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 [this message]
2015-05-07 22:04 ` Luke Diamand
2015-05-07 22:16 ` Junio C Hamano
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=xmqq3838nl5l.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).