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>
Luke Diamand committed
May 19, 2015 at 23:23 UTC
2dade7a7b20902a145d1c130830bcb4d4b288a32
3 files changed
+3
-3
git-p4.py
+1
-1
@@ -1220,7 +1220,7 @@ class P4Submit(Command, P4UserMap):
1220
editor = os.environ.get("P4EDITOR")
1221
else:
1222
editor = read_pipe("git var GIT_EDITOR").strip()
1223
- system([editor, template_file])
1223
+ system(["sh", "-c", ('%s "$@"' % editor), editor, template_file])
1224
1225
# If the file was not saved, prompt to see if this patch should
1226
# be skipped. But skip this verification step if configured so.
t/t9805-git-p4-skip-submit-edit.sh
+1
-1
@@ -90,7 +90,7 @@ test_expect_success 'no config, edited' '
90
cd "$git" &&
91
echo line >>file1 &&
92
git commit -a -m "change 5" &&
93
- P4EDITOR="$TRASH_DIRECTORY/ed.sh" &&
93
+ P4EDITOR="\"$TRASH_DIRECTORY/ed.sh\"" &&
94
export P4EDITOR &&
95
git p4 submit &&
96
p4 changes //depot/... >wc &&
t/t9820-git-p4-editor-handling.sh
+1
-1
@@ -19,7 +19,7 @@ test_expect_success 'init depot' '
19
20
# Check that the P4EDITOR argument can be given command-line
21
# options, which git-p4 will then pass through to the shell.
22
-test_expect_failure 'EDITOR with options' '
22
+test_expect_success 'EDITOR with options' '
23
git p4 clone --dest="$git" //depot &&
24
test_when_finished cleanup_git &&
25
(