From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 24 Sep 2017 19:13:36 +0000 (+0200)
Subject: don'T forget to prune, don't indent case
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0604a3825b612f0e69564a45e5b468f673351353;p=xonotic%2Fxonotic-data.pk3dir.git

don'T forget to prune, don't indent case
---

diff --git a/qcsrc/tools/uncrustify-unmodified.py b/qcsrc/tools/uncrustify-unmodified.py
index a5869accae..f10bceee1b 100755
--- a/qcsrc/tools/uncrustify-unmodified.py
+++ b/qcsrc/tools/uncrustify-unmodified.py
@@ -21,6 +21,8 @@ def main():
 
 	# get the latest changes on all branches
 	run('git fetch')
+	# remove merged/deleted remote branches
+	run('git remote prune origin')
 
 	# get all remote branches - those would potentially get merge conflicts if we formatted everything
 	branches = run('git branch --list --remotes')
diff --git a/qcsrc/uncrustify.cfg b/qcsrc/uncrustify.cfg
index 64fe7dd5cb..8b4770e402 100644
--- a/qcsrc/uncrustify.cfg
+++ b/qcsrc/uncrustify.cfg
@@ -181,7 +181,7 @@ indent_relative_single_line_comments     = true    # false/true #force
 
 # Spaces to indent 'case' from 'switch'
 # Usually 0 or indent_columns.
-indent_switch_case                       = indent_columns # number
+indent_switch_case                       = 0 # number
 
 # Spaces to shift the 'case' line, without affecting any other lines
 # Usually 0.