Bug 36572 – commit-log-editor: thinks mergeChangeLogs.pl is a ChangeLog file

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[David Kilzer (:ddkilzer)]

Created attachment 51577 [details]
Patch

Reviewed by NOBODY (OOPS!).

Fixes the following error when committing a file with
"ChangeLog" in the name that isn't a ChangeLog (like
mergeChangeLogs.pl from r56471 and r56472):

$ git commit .
Can't open WebKitTools/Scripts/webkitperl/VCSUtils_unittest/mergeChangeLog at commit-log-editor line 132.
error: There was a problem with the editor 'commit-log-editor'.
Please supply the message using either -m or -F option.

* Scripts/commit-log-editor: Added '$' to anchor "ChangeLog" to
the end of the file name when searching for ChangeLog files in a
commit.
---
 2 files changed, 20 insertions(+), 1 deletions(-)

[Eric Seidel (no email)]

Comment on attachment 51577 [details]
Patch

LGTM.

Looks like the equivalent python code should be OK:
http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/changelogs.py#L44

[Eric Seidel (no email)]

Attachment 51577 [details] was posted by a committer and has review+, assigning to David Kilzer for commit.

[David Kilzer (:ddkilzer)]

Committed r56484: <http://trac.webkit.org/changeset/56484>

[Eric Seidel (no email)]

Committed r56487: <http://trac.webkit.org/changeset/56487>

[David Kilzer (:ddkilzer)]

(In reply to comment #4)
> Committed r56487: <http://trac.webkit.org/changeset/56487>

Thanks Eric.  There seems to be quite an impedance mismatch between my desired workflow and webkit-patch at the moment.

[Eric Seidel (no email)]

Sorry for the spam.  I'm not sure why webkit-patch got confused there.