diff options
| author | Luke Diamand <luke@diamand.org> | 2015-05-19 22:23:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-24 18:50:12 (GMT) |
| commit | 2dade7a7b20902a145d1c130830bcb4d4b288a32 (patch) | |
| tree | eb09f361703fcae2512578be2078c502747efffe /t | |
| parent | 9afbb2dc371441ad250d5e094277699b58dbd88c (diff) | |
| download | git-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 't')
| -rwxr-xr-x | t/t9805-git-p4-skip-submit-edit.sh | 2 | ||||
| -rwxr-xr-x | t/t9820-git-p4-editor-handling.sh | 2 |
2 files changed, 2 insertions, 2 deletions
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 && ( |