diff options
| author | Steve Block <steveblock@google.com> | 2010-08-27 11:02:25 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-02 17:17:20 +0100 |
| commit | e8b154fd68f9b33be40a3590e58347f353835f5c (patch) | |
| tree | 0733ce26384183245aaa5656af26c653636fe6c1 /WebKitTools/Scripts/webkitpy/common/checkout | |
| parent | da56157816334089526a7a115a85fd85a6e9a1dc (diff) | |
| download | external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.zip external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.gz external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.bz2 | |
Merge WebKit at r66079 : Initial merge by git
Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
Diffstat (limited to 'WebKitTools/Scripts/webkitpy/common/checkout')
| -rw-r--r-- | WebKitTools/Scripts/webkitpy/common/checkout/scm.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |