diff options
| -rwxr-xr-x | git-p4.py | 2 | ||||
| -rwxr-xr-x | t/t9805-git-p4-skip-submit-edit.sh | 2 | ||||
| -rwxr-xr-x | t/t9820-git-p4-editor-handling.sh | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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. diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh index 8931188..5fbf904 100755 --- a/t/t9805-git-p4-skip-submit-edit.sh +++ b/t/t9805-git-p4-skip-submit-edit.sh @@ -90,7 +90,7 @@ test_expect_success 'no config, edited' ' cd "$git" && echo line >>file1 && git commit -a -m "change 5" && - P4EDITOR="$TRASH_DIRECTORY/ed.sh" && + P4EDITOR="\"$TRASH_DIRECTORY/ed.sh\"" && export P4EDITOR && git p4 submit && p4 changes //depot/... >wc && diff --git a/t/t9820-git-p4-editor-handling.sh b/t/t9820-git-p4-editor-handling.sh index abaa066..6dc6df0 100755 --- a/t/t9820-git-p4-editor-handling.sh +++ b/t/t9820-git-p4-editor-handling.sh @@ -19,7 +19,7 @@ test_expect_success 'init depot' ' # Check that the P4EDITOR argument can be given command-line # options, which git-p4 will then pass through to the shell. -test_expect_failure 'EDITOR with options' ' +test_expect_success 'EDITOR with options' ' git p4 clone --dest="$git" //depot && test_when_finished cleanup_git && ( |