pull: support pull.ff config

diff --git a/git-p4.py b/git-p4.py
index 41a77e6648ddad9a7599452bf361fd13ff4dcf88..ca6bb95c573608f8477ed7f3388c5df1e63f8041 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.