Title: [173887] trunk/Tools
Revision
173887
Author
jer.no...@apple.com
Date
2014-09-23 13:54:14 -0700 (Tue, 23 Sep 2014)

Log Message

[Tools] git-commit uses wrong ChangeLog when run from a subdirectory
https://bugs.webkit.org/show_bug.cgi?id=137031

Reviewed by Joseph Pecoraro.

commit-log-editor is run from the top of the Git checkout, even when git-commit is invoked
from a subdirectory, making the parsed locations of ChangeLog files incorrect. Git provides
a mapping prefix in the GIT_PREFIX environment variable, so apply this prefix to the parsed
ChangeLog locations before passing them to createCommitMessage().

* Scripts/commit-log-editor:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (173886 => 173887)


--- trunk/Tools/ChangeLog	2014-09-23 20:21:51 UTC (rev 173886)
+++ trunk/Tools/ChangeLog	2014-09-23 20:54:14 UTC (rev 173887)
@@ -1,3 +1,17 @@
+2014-09-23  Jer Noble  <jer.no...@apple.com>
+
+        [Tools] git-commit uses wrong ChangeLog when run from a subdirectory
+        https://bugs.webkit.org/show_bug.cgi?id=137031
+
+        Reviewed by Joseph Pecoraro.
+
+        commit-log-editor is run from the top of the Git checkout, even when git-commit is invoked
+        from a subdirectory, making the parsed locations of ChangeLog files incorrect. Git provides
+        a mapping prefix in the GIT_PREFIX environment variable, so apply this prefix to the parsed
+        ChangeLog locations before passing them to createCommitMessage().
+
+        * Scripts/commit-log-editor:
+
 2014-09-23  Youenn Fablet  <youenn.fab...@crf.canon.fr>
 
         W3C test importer should detect manual and reference tests according their filenames

Modified: trunk/Tools/Scripts/commit-log-editor (173886 => 173887)


--- trunk/Tools/Scripts/commit-log-editor	2014-09-23 20:21:51 UTC (rev 173886)
+++ trunk/Tools/Scripts/commit-log-editor	2014-09-23 20:54:14 UTC (rev 173887)
@@ -152,6 +152,8 @@
 }
 close LOG;
 
+@changeLogs = map { $ENV{GIT_PREFIX} . $_ } @changeLogs if isGit();
+
 # We want to match the line endings of the existing log file in case they're
 # different from perl's line endings.
 $endl = $1 if $logContents =~ /(\r?\n)/;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to