Skip to content

Commit

Permalink
fix git-p4 editor invocation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nicolas Pitre authored and Junio C Hamano committed Jan 22, 2010
1 parent 2d0d706 commit 8b187e6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contrib/fast-import/git-p4
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 8b187e6

Please sign in to comment.