summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2015-05-19 22:23:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-24 18:50:12 (GMT)
commit2dade7a7b20902a145d1c130830bcb4d4b288a32 (patch)
treeeb09f361703fcae2512578be2078c502747efffe /git-p4.py
parent9afbb2dc371441ad250d5e094277699b58dbd88c (diff)
downloadgit-2dade7a7b20902a145d1c130830bcb4d4b288a32.zip
git-2dade7a7b20902a145d1c130830bcb4d4b288a32.tar.gz
git-2dade7a7b20902a145d1c130830bcb4d4b288a32.tar.bz2
git-p4: fix handling of multi-word P4EDITOR
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. This also adjusts t9805, which relied on the previous behaviour. Suggested-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index ff132b2..de06046 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([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.