From 0604a3825b612f0e69564a45e5b468f673351353 Mon Sep 17 00:00:00 2001 From: Martin Taibr Date: Sun, 24 Sep 2017 21:13:36 +0200 Subject: [PATCH] don'T forget to prune, don't indent case --- qcsrc/tools/uncrustify-unmodified.py | 2 ++ qcsrc/uncrustify.cfg | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/qcsrc/tools/uncrustify-unmodified.py b/qcsrc/tools/uncrustify-unmodified.py index a5869acca..f10bceee1 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 64fe7dd5c..8b4770e40 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. -- 2.39.2