diff options
Diffstat (limited to 'WebKitTools/Scripts/commit-log-editor')
| -rwxr-xr-x | WebKitTools/Scripts/commit-log-editor | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKitTools/Scripts/commit-log-editor b/WebKitTools/Scripts/commit-log-editor index e58b181..75017e3 100755 --- a/WebKitTools/Scripts/commit-log-editor +++ b/WebKitTools/Scripts/commit-log-editor @@ -170,7 +170,8 @@ for my $changeLog (@changeLogs) { # Attempt to insert the "patch by" line, after the first blank line. if ($previousLineWasBlank && $hasAuthorInfoToWrite && $lineCount > 0) { - my $authorAndCommitterAreSamePerson = $ENV{EMAIL_ADDRESS} && $email eq $ENV{EMAIL_ADDRESS}; + my $committerEmail = changeLogEmailAddress(); + my $authorAndCommitterAreSamePerson = $email eq $committerEmail; if (!$authorAndCommitterAreSamePerson) { $contents .= "Patch by $author <$email> on $date\n"; $hasAuthorInfoToWrite = 0; @@ -229,7 +230,7 @@ if (isGit() && scalar keys %changeLogSort == 0) { chomp($webkitGenerateCommitMessage = `git config --bool core.webkitGenerateCommitMessage`); } if ($webkitGenerateCommitMessage ne "false") { - open CHANGELOG_ENTRIES, "-|", "prepare-ChangeLog --git-index --no-write" or die "prepare-ChangeLog failed: $!.\n"; + open CHANGELOG_ENTRIES, "-|", "$FindBin::Bin/prepare-ChangeLog --git-index --no-write" or die "prepare-ChangeLog failed: $!.\n"; while (<CHANGELOG_ENTRIES>) { print NEWLOG normalizeLineEndings($_, $endl); } |