resolve-ChangeLogs should not die on unmerged non-ChangeLog files
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Mar 2009 00:54:53 +0000 (00:54 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Mar 2009 00:54:53 +0000 (00:54 +0000)
        Reviewed by Adam Roben.

        Fixes the following bug in resolve-ChangeLogs:

            Use of uninitialized value in -e at ./WebKitTools/Scripts/resolve-ChangeLogs line 132.
            Died at ./WebKitTools/Scripts/resolve-ChangeLogs line 164.

        * Scripts/resolve-ChangeLogs:
        (findUnmergedChangeLogs): Check the result of findChangeLog() to
        make sure we don't add undef values to the list of files being
        returned.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41795 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/Scripts/resolve-ChangeLogs

index 84b59e2..164b10d 100644 (file)
@@ -1,3 +1,19 @@
+2009-03-17  David Kilzer  <ddkilzer@apple.com>
+
+        resolve-ChangeLogs should not die on unmerged non-ChangeLog files
+
+        Reviewed by Adam Roben.
+
+        Fixes the following bug in resolve-ChangeLogs:
+
+            Use of uninitialized value in -e at ./WebKitTools/Scripts/resolve-ChangeLogs line 132.
+            Died at ./WebKitTools/Scripts/resolve-ChangeLogs line 164.
+
+        * Scripts/resolve-ChangeLogs:
+        (findUnmergedChangeLogs): Check the result of findChangeLog() to
+        make sure we don't add undef values to the list of files being
+        returned.
+
 2009-03-17  Gustavo Noronha Silva  <gns@gnome.org>
 
         Reviewed by Simon Fraser.
index a89558a..306565c 100755 (executable)
@@ -220,13 +220,15 @@ sub findUnmergedChangeLogs()
     while (<STAT>) {
         if ($isSVN) {
             if (/^([C]).{5} (.+)$/) {
-                push @results, findChangeLog($2);
+                my $file = findChangeLog($2);
+                push @results, $file if $file;
             } else {
                 print;  # error output from svn stat
             }
         } elsif ($isGit) {
             if (/^([U])\t(.+)$/) {
-                push @results, findChangeLog($2);
+                my $file = findChangeLog($2);
+                push @results, $file if $file;
             } else {
                 print;  # error output from git diff
             }