prepare-ChangeLog reports as deleted methods that has not been removed.
authorllango.u-szeged@partner.samsung.com <llango.u-szeged@partner.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Apr 2014 08:55:18 +0000 (08:55 +0000)
committerllango.u-szeged@partner.samsung.com <llango.u-szeged@partner.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Apr 2014 08:55:18 +0000 (08:55 +0000)
https://bugs.webkit.org/show_bug.cgi?id=131733

Reviewed by Ryosuke Niwa.

* Scripts/prepare-ChangeLog:
(originalFile): Set merge base to origin/master by default.

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

Tools/ChangeLog
Tools/Scripts/prepare-ChangeLog

index 2d0a054..f2a28a9 100644 (file)
@@ -1,3 +1,13 @@
+2014-04-24  László Langó  <llango.u-szeged@partner.samsung.com>
+
+        prepare-ChangeLog reports as deleted methods that has not been removed.
+        https://bugs.webkit.org/show_bug.cgi?id=131733
+
+        Reviewed by Ryosuke Niwa.
+
+        * Scripts/prepare-ChangeLog:
+        (originalFile): Set merge base to origin/master by default.
+
 2014-04-23  James Craig  <jcraig@apple.com>
 
         prepare-Changelog and svn-create-patch should optionally run check-webkit-style.
index 8b75c6f..16f05e4 100755 (executable)
@@ -250,7 +250,11 @@ sub originalFile($$$$)
         $command = SVN . " cat $escapedPathsString";
     } elsif (isGit()) {
         $command = GIT . " show ";
-        $command .= "$mergeBase" if $mergeBase;
+        if ($mergeBase) {
+            $command .= "$mergeBase";
+        } else {
+            $command .= "origin/master";
+        }
         $command .= ":$file";
     }