diff options
author | Luke Diamand <luke@diamand.org> | 2015-05-20 01:23:17 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-24 21:50:12 +0300 |
commit | 2dade7a7b20902a145d1c130830bcb4d4b288a32 (patch) | |
tree | eb09f361703fcae2512578be2078c502747efffe /t/t9805-git-p4-skip-submit-edit.sh | |
parent | 9afbb2dc371441ad250d5e094277699b58dbd88c (diff) |
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/t9805-git-p4-skip-submit-edit.sh')
-rwxr-xr-x | t/t9805-git-p4-skip-submit-edit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh index 89311886db..5fbf904dc8 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 && |