[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit e84dcbbd81b5f48a7141a1c33e47725bd8a429e8
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 21 17:03:47 2010 +0000

    Make prepare-ChangeLog much faster when using git
    
    This change also seems to make it detect renames better in some cases.
    
    Fixes <http://webkit.org/b/48040> prepare-ChangeLog is slow when using
    git
    
    Reviewed by David Kilzer.
    
    * Scripts/prepare-ChangeLog:
    (statusCommand):
    (createPatchCommand):
    Use "-M -C" instead of "-C -C -M" to tell git-diff to detect renames
    and copies. The two "-C"s were making it read many more files than were
    necessary.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70246 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a394f86..f5f984a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-20  Adam Roben  <aroben at apple.com>
+
+        Make prepare-ChangeLog much faster when using git
+
+        This change also seems to make it detect renames better in some cases.
+
+        Fixes <http://webkit.org/b/48040> prepare-ChangeLog is slow when using
+        git
+
+        Reviewed by David Kilzer.
+
+        * Scripts/prepare-ChangeLog:
+        (statusCommand):
+        (createPatchCommand):
+        Use "-M -C" instead of "-C -C -M" to tell git-diff to detect renames
+        and copies. The two "-C"s were making it read many more files than were
+        necessary.
+
 2010-10-21  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Adam Roben.
diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index 608c9ce..ad84e4f 100755
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -1302,7 +1302,7 @@ sub statusCommand(@)
     if ($isSVN) {
         $command = "$SVN stat $filesString";
     } elsif ($isGit) {
-        $command = "$GIT diff -r --name-status -C -C -M " . diffFromToString();
+        $command = "$GIT diff -r --name-status -M -C " . diffFromToString();
         $command .= " -- $filesString" unless $gitCommit;
     }
 
@@ -1317,7 +1317,7 @@ sub createPatchCommand($)
     if ($isSVN) {
         $command = "'$FindBin::Bin/svn-create-patch' $changedFilesString";
     } elsif ($isGit) {
-        $command = "$GIT diff -C -C -M " . diffFromToString();
+        $command = "$GIT diff -M -C " . diffFromToString();
         $command .= " -- $changedFilesString" unless $gitCommit;
     }
 

-- 
WebKit Debian packaging