Title: [215615] trunk/Tools
Revision
215615
Author
[email protected]
Date
2017-04-21 10:26:14 -0700 (Fri, 21 Apr 2017)

Log 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.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (215614 => 215615)


--- trunk/Tools/ChangeLog	2017-04-21 17:26:07 UTC (rev 215614)
+++ trunk/Tools/ChangeLog	2017-04-21 17:26:14 UTC (rev 215615)
@@ -1,3 +1,16 @@
+2017-04-20  Conrad Shultz  <[email protected]>
+
+        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  <[email protected]>
 
         Reduce copies and allocations in SharedBuffer::append

Modified: trunk/Tools/Scripts/commit-log-editor (215614 => 215615)


--- trunk/Tools/Scripts/commit-log-editor	2017-04-21 17:26:07 UTC (rev 215614)
+++ trunk/Tools/Scripts/commit-log-editor	2017-04-21 17:26:14 UTC (rev 215615)
@@ -90,7 +90,13 @@
 
 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);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to