Changeset 215615 in webkit

Timestamp:

Apr 21, 2017, 10:26:14 AM (9 years ago)

Author:

Conrad Shultz

Message:

commit-log-editor should respect the git editor if one is set
​https://bugs.webkit.org/show_bug.cgi?id=171085
<rdar://problem/31745506>

Reviewed by Daniel Bates.

• Scripts/commit-log-editor:

If Git is available, consider GIT_LOG_EDITOR and any global Git editor preference when
deciding which editor to present. We examine the global editor preference since that may be
set automatically by installers or third-party tools.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/commit-log-editor (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-04-20  Conrad Shultz  <conrad_shultz@apple.com>
+
+        commit-log-editor should respect the git editor if one is set
+        https://bugs.webkit.org/show_bug.cgi?id=171085
+        <rdar://problem/31745506>
+
+        Reviewed by Daniel Bates.
+
+        * Scripts/commit-log-editor:
+        If Git is available, consider GIT_LOG_EDITOR and any global Git editor preference when
+        deciding which editor to present. We examine the global editor preference since that may be
+        set automatically by installers or third-party tools.
+
 2017-04-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/Scripts/commit-log-editor

@@ -91 +91 @@
 my $baseDir = baseProductDir();
 
-my $editor = $ENV{SVN_LOG_EDITOR};
+my $editor;
+if (isGit()) {
+    $editor = $ENV{GIT_LOG_EDITOR};
+    $editor = `git config --global --get core.editor` if !$editor;
+}
+
+$editor = $ENV{SVN_LOG_EDITOR} if !$editor;
 $editor = $ENV{CVS_LOG_EDITOR} if !$editor;
 $editor = "" if $editor && isCommitLogEditor($editor);