Fix Bug 14403: prepare-ChangeLog --git-commit doesn't support --diff
authoraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Jun 2007 03:09:51 +0000 (03:09 +0000)
committeraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Jun 2007 03:09:51 +0000 (03:09 +0000)
http://bugs.webkit.org/show_bug.cgi?id=14403

Reviewed by Mark Rowe.

* Scripts/prepare-ChangeLog: Don't spew to stdout, use stderr instead.
(sub createPatchCommand): Generate a correct diff in the $gitCommit
case.

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

WebKitTools/ChangeLog
WebKitTools/Scripts/prepare-ChangeLog

index 323d9b061a52506cfaa8c68f52c207ffc7746ee5..b473a8ac972828e4e4251dece1b0ac5083f70b27 100644 (file)
@@ -1,3 +1,14 @@
+2007-06-25  Adam Roben  <aroben@apple.com>
+
+        Fix Bug 14403: prepare-ChangeLog --git-commit doesn't support --diff
+        http://bugs.webkit.org/show_bug.cgi?id=14403
+
+        Reviewed by Mark Rowe.
+
+        * Scripts/prepare-ChangeLog: Don't spew to stdout, use stderr instead.
+        (sub createPatchCommand): Generate a correct diff in the $gitCommit
+        case.
+
 2007-06-25  Adam Roben  <aroben@apple.com>
 
         Land pdevenv and supporting scripts/programs
index eae80024b3a798ecc866bd94baa4e41384b7a881..96ee8b66c4917717ccc5572d508f45a94d60a7c1 100755 (executable)
@@ -303,7 +303,7 @@ foreach my $prefix (sort keys %files) {
         }
 
         if (!$reviewer) {
-            print "WARNING!!! Change was not reviewed!\n";
+            print STDERR "WARNING!!! Change was not reviewed!\n";
             $reviewer = "NOBODY (OO" . "PS!)";
         }
 
@@ -961,6 +961,7 @@ sub createPatchCommand($)
     my ($changedFilesString) = @_;
 
     return "'$FindBin::Bin/svn-create-patch' $changedFilesString" if isSVN();
+    return "$GIT diff -C -M \"$gitCommit^\" \"$gitCommit\"" if $gitCommit;
     return "$GIT diff -C -M HEAD -- $changedFilesString" if isGit();
 }