Merge branch 'tb/complete-sequencing'

diff --git a/git-p4.py b/git-p4.py
index d0df1d92e0eaee1d3ba54e09860f00b42ee03d6b..26ad4bcf77e36624e4261ae2dfd93ba637914b9d 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1248,7 +1248,7 @@ def edit_template(self, template_file):
             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.