From e8b154fd68f9b33be40a3590e58347f353835f5c Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Fri, 27 Aug 2010 11:02:25 +0100
Subject: Merge WebKit at r66079 : Initial merge by git

Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
---
 WebKitTools/Scripts/commit-log-editor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'WebKitTools/Scripts/commit-log-editor')

diff --git a/WebKitTools/Scripts/commit-log-editor b/WebKitTools/Scripts/commit-log-editor
index 1be0fd0..f40295d 100755
--- a/WebKitTools/Scripts/commit-log-editor
+++ b/WebKitTools/Scripts/commit-log-editor
@@ -63,7 +63,7 @@ my $baseDir = baseProductDir();
 
 my $editor = $ENV{SVN_LOG_EDITOR};
 $editor = $ENV{CVS_LOG_EDITOR} if !$editor;
-$editor = "" if isCommitLogEditor($editor);
+$editor = "" if $editor && isCommitLogEditor($editor);
 
 my $splitEditor = 1;
 if (!$editor) {
-- 
cgit v1.1