summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2012-04-24 08:33:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-24 21:22:21 (GMT)
commitf95ceaf04aa304cff1bf0bc76e8fed3fea5d0484 (patch)
treeb8a0d788236d31b81c50fae4df96cefc1e6c9a7c /git-p4.py
parent1e3e7180a1bc0c7af7ad8ccaa45467f6ee92f2bd (diff)
downloadgit-f95ceaf04aa304cff1bf0bc76e8fed3fea5d0484.zip
git-f95ceaf04aa304cff1bf0bc76e8fed3fea5d0484.tar.gz
git-f95ceaf04aa304cff1bf0bc76e8fed3fea5d0484.tar.bz2
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>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index 0009d73..6ce88ff 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -994,7 +994,7 @@ class P4Submit(Command, P4UserMap):
mtime = os.stat(template_file).st_mtime
# 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")
else:
editor = read_pipe("git var GIT_EDITOR").strip()