Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 48059d0aa74fe5f4c14bd74f599d449335ef8519..d1512e0acf7015533bd55e821f9a663285fa4930 100755 (executable)
--- 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"