Luke Diamand <luke@xxxxxxxxxxx> writes:
> This teaches git-p4 to pass the P4EDITOR variable to the
> shell for expansion, so that any command-line arguments are
> correctly handled. Without this, git-p4 can only launch the
> editor if P4EDITOR is solely the path to the binary, without
> any arguments.
Does the real Perforce, when spawning P4EDITOR, behave the same way?
If not, this patch would be breaking not just the expectation of
existing git-p4 users (which we cannot avoid and which we are
willing to do) but also breaking things for people who _will_ come
to us in the future, expecting that
export P4EDITOR="/Users/me/My Programs/my-editor"
to work as they expect. If they already have to do
export P4EDITOR="'/Users/me/My Programs/my-editor'"
then there is no problem, but because I am not a P4EDITOR user, I am
merely double checking.
>
> Suggested-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
> Signed-off-by: Luke Diamand <luke@xxxxxxxxxxx>
> ---
> git-p4.py | 2 +-
> t/t9820-git-p4-editor-handling.sh | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/git-p4.py b/git-p4.py
> index 41a77e6..ca6bb95 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -1248,7 +1248,7 @@ class P4Submit(Command, P4UserMap):
> editor = os.environ.get("P4EDITOR")
> else:
> editor = read_pipe("git var GIT_EDITOR").strip()
> - system([editor, template_file])
> + system(["sh", "-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.
> diff --git a/t/t9820-git-p4-editor-handling.sh b/t/t9820-git-p4-editor-handling.sh
> index e0a3c52..c178bd7 100755
> --- a/t/t9820-git-p4-editor-handling.sh
> +++ b/t/t9820-git-p4-editor-handling.sh
> @@ -17,9 +17,9 @@ test_expect_success 'init depot' '
> )
> '
>
> -test_expect_failure 'EDITOR has options' '
> # Check that the P4EDITOR argument can be given command-line
> # options, which git-p4 will then pass through to the shell.
> +test_expect_success 'EDITOR has options' '
> git p4 clone --dest="$git" //depot &&
> test_when_finished cleanup_git &&
> (
--
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