kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git p4: Ignore P4EDITOR if it is empty 

p4 itself treats an empty value for P4EDITOR as the same as
having P4EDITOR unset. Do the same for "git p4".

Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Luke Diamand 2012-04-24 09:33:21 +01:00 committed by Junio C Hamano
parent 1e3e7180a1
commit f95ceaf04a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-p4.py
View File

@ -994,7 +994,7 @@ class P4Submit(Command, P4UserMap):
mtime = os.stat(template_file).st_mtime mtime = os.stat(template_file).st_mtime


# invoke the editor # invoke the editor
if os.environ.has_key("P4EDITOR"): if os.environ.has_key("P4EDITOR") and (os.environ.get("P4EDITOR") != ""):
editor = os.environ.get("P4EDITOR") editor = os.environ.get("P4EDITOR")
else: else:
editor = read_pipe("git var GIT_EDITOR").strip() editor = read_pipe("git var GIT_EDITOR").strip()