From: Nicolas Pitre <nico@fluxnic.net>
Date: Fri, 22 Jan 2010 05:55:15 +0000 (-0500)
Subject: fix git-p4 editor invocation
X-Git-Tag: v1.7.0-rc0~39
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8b187e6b0e114055071a9ae8f56b9a2a24bfaf8f;p=git.git

fix git-p4 editor invocation

The strip() is required to remove the trailing newline character,
as already done elsewhere.

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 48059d0aa..d1512e0ac 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -732,7 +732,7 @@ class P4Submit(Command):
             if os.environ.has_key("P4EDITOR"):
                 editor = os.environ.get("P4EDITOR")
             else:
-                editor = read_pipe("git var GIT_EDITOR")
+                editor = read_pipe("git var GIT_EDITOR").strip()
             system(editor + " " + fileName)
 
             response = "y"