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

[ojan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 9ccf8fe033d723c7df59011884cc98547340e3f5
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 00:40:51 2010 +0000

    2010-08-25  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Eric Seidel.
    
            fix the always squash git config
            https://bugs.webkit.org/show_bug.cgi?id=44651
    
            Fix help text and apparently underscores are not allowed
            in git config keys.
    
            * Scripts/webkitpy/common/checkout/scm.py:
            * Scripts/webkitpy/tool/steps/commit.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index fa65f78..544c6f8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-25  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        fix the always squash git config
+        https://bugs.webkit.org/show_bug.cgi?id=44651
+
+        Fix help text and apparently underscores are not allowed
+        in git config keys.
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+        * Scripts/webkitpy/tool/steps/commit.py:
+
 2010-08-25  Darin Adler  <darin at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebKitTools/Scripts/webkitpy/common/checkout/scm.py b/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
index 5a6c48c..793d96d 100644
--- a/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
+++ b/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
@@ -719,7 +719,7 @@ class Git(SCM):
         self.run(['git', 'checkout', 'HEAD'] + file_paths)
 
     def _assert_can_squash(self, working_directory_is_clean):
-        squash = Git.read_git_config('webkit-patch.commit_should_always_squash')
+        squash = Git.read_git_config('webkit-patch.commit-should-always-squash')
         should_squash = squash and squash.lower() == "true"
 
         if not should_squash:
diff --git a/WebKitTools/Scripts/webkitpy/tool/steps/commit.py b/WebKitTools/Scripts/webkitpy/tool/steps/commit.py
index 9f93120..8f70b81 100644
--- a/WebKitTools/Scripts/webkitpy/tool/steps/commit.py
+++ b/WebKitTools/Scripts/webkitpy/tool/steps/commit.py
@@ -43,7 +43,7 @@ class Commit(AbstractStep):
     def _commit_warning(self, error):
         working_directory_message = "" if error.working_directory_is_clean else " and working copy changes"
         return ('There are %s local commits%s. Everything will be committed as a single commit. '
-                'To avoid this prompt, set "git config webkit-patch.squash true".' % (
+                'To avoid this prompt, set "git config webkit-patch.commit-should-always-squash true".' % (
                 error.num_local_commits, working_directory_message))
 
     def run(self, state):

-- 
WebKit Debian packaging