commit 0680c6978c61807451f320e28df01c432769085e
author nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Jan 18 01:08:21 2014 +0000
committer nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Jan 18 01:08:21 2014 +0000
tree fc4360a78a3c8999aca17b1954a58ba539fc9cc1
parent c82706326c2597fd07b8c1e7936f6f4d987f116d

git_cl format: allow WebKit style to be picked up from .clang-format

BUG=240309
TEST='git cl format' and 'git cl format --full' indent by 4 when run inside of third_party/WebKit
TBR=iannucci@chromium.org

Review URL: https://codereview.chromium.org/136333010

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@245694 0039d316-1c4b-4281-b951-d872f2087c98

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 4527944..f6c1ae7 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2358,7 +2358,7 @@
     if not files:
       print "Nothing to format."
       return 0
-    RunCommand([clang_format_tool, '-i', '-style', 'Chromium'] + files,
+    RunCommand([clang_format_tool, '-i'] + files,
                cwd=top_dir)
   else:
     env = os.environ.copy()
@@ -2370,7 +2370,7 @@
     except clang_format.NotFoundError, e:
       DieWithError(e)
 
-    cmd = [sys.executable, script, '-p0', '-style', 'Chromium', '-i']
+    cmd = [sys.executable, script, '-p0', '-i']
 
     RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)