From 146e5580185cd302da2d6ce324083b99bffea8b5 Mon Sep 17 00:00:00 2001
From: John Langford <jl@hunch.net>
Date: Wed, 19 Jul 2017 13:03:42 -0400
Subject: [PATCH] turn off autostyle for new versions and shift to Allman

---
 .editorconfig        | 2 +-
 utl/new_version      | 4 ++--
 vowpalwabbit/main.cc | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index dfb527d0d1d..6fc27f7f1dc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,7 +18,7 @@ trim_trailing_whitespace = true
 [*.{cc,h}]
 indent_style = space
 indent_size = 2
-indent_brace_style = Horstmann
+indent_brace_style = Allman
 
 # Makefiles need tab indentation
 [Makefile]
diff --git a/utl/new_version b/utl/new_version
index 60d549525e5..5994f68ce21 100755
--- a/utl/new_version
+++ b/utl/new_version
@@ -7,8 +7,8 @@
 #sudo apt-get install npm
 #sudo npm install -g eclint
 
-find -regextype posix-extended -regex '.*\.(cc|h|cpp)' | xargs eclint fix
-find -regextype posix-extended -regex '.*\.(cc|h|cpp)' | grep -v vw_clr | xargs astyle -s2 --style=horstmann --lineend=linux --keep-one-line-blocks --keep-one-line-statements
+#find -regextype posix-extended -regex '.*\.(cc|h|cpp)' | xargs eclint fix
+#find -regextype posix-extended -regex '.*\.(cc|h|cpp)' | grep -v vw_clr | xargs astyle -s2 --style=horstmann --lineend=linux --keep-one-line-blocks --keep-one-line-statements
 git commit -a -m "consistent indentation with astyle (before releasing $1)"
 git push
 git branch $1
diff --git a/vowpalwabbit/main.cc b/vowpalwabbit/main.cc
index 80617221390..54473298abd 100644
--- a/vowpalwabbit/main.cc
+++ b/vowpalwabbit/main.cc
@@ -25,7 +25,7 @@ vw* setup(int argc, char* argv[])
   all->vw_is_main = true;
 
   if (!all->quiet && !all->bfgs && !all->searchstr && !all->vm.count("audit_regressor"))
-  { all->trace_message << std::left
+    { all->trace_message << std::left
               << std::setw(shared_data::col_avg_loss) << std::left << "average"
               << " "
               << std::setw(shared_data::col_since_last) << std::left << "since"
@@ -127,4 +127,3 @@ int main(int argc, char *argv[])
   // cin.ignore();
   return 0;
 }
-