From 8b187e6b0e114055071a9ae8f56b9a2a24bfaf8f Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Fri, 22 Jan 2010 00:55:15 -0500 Subject: [PATCH] fix git-p4 editor invocation The strip() is required to remove the trailing newline character, as already done elsewhere. Signed-off-by: Nicolas Pitre Signed-off-by: Junio C Hamano --- contrib/fast-import/git-p4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 48059d0aa7..d1512e0acf 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"