Bug 21997: prepare-ChangeLog should filter out ChangeLog files
<https://bugs.webkit.org/show_bug.cgi?id=21997>
Reviewed by Darin Adler.
* Scripts/prepare-ChangeLog:
(generateFileList): Don't add ChangeLog files to %{$functionLists}.
This prevents them from showing up in the new ChangeLog entry. They
were already excluded from @{$changedFiles}.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@38038 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4f4f740..0dd811b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2008-10-31 David Kilzer <ddkilzer@apple.com>
+
+ Bug 21997: prepare-ChangeLog should filter out ChangeLog files
+
+ <https://bugs.webkit.org/show_bug.cgi?id=21997>
+
+ Reviewed by Darin Adler.
+
+ * Scripts/prepare-ChangeLog:
+ (generateFileList): Don't add ChangeLog files to %{$functionLists}.
+ This prevents them from showing up in the new ChangeLog entry. They
+ were already excluded from @{$changedFiles}.
+
2008-10-30 Mark Rowe <mrowe@apple.com>
Reviewed by Jon Homeycutt.
diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index 179e766..ff4ce80 100755
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -1252,8 +1252,10 @@
} elsif (isConflictStatus($status)) {
push @{$conflictFiles}, $file;
}
- my $description = statusDescription($status, $original);
- $functionLists->{$file} = $description if defined $description;
+ if (basename($file) ne "ChangeLog") {
+ my $description = statusDescription($status, $original);
+ $functionLists->{$file} = $description if defined $description;
+ }
}
close STAT;
}
