diff options
| author |  Nicolas Pitre <nico@fluxnic.net> | 2010-01-22 00:55:15 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-21 22:02:28 -0800 |
| commit | 8b187e6b0e114055071a9ae8f56b9a2a24bfaf8f (patch) | |
| tree | b22f22016a24d5effb077dc781fd2f7dd36db55b /contrib/fast-import | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-8b187e6b0e114055071a9ae8f56b9a2a24bfaf8f.tar.xz | |
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>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
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" |