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

diff --git a/qcsrc/tools/uncrustify-unmodified.py b/qcsrc/tools/uncrustify-unmodified.py
index a5869accae20604fb2888c178dcda5bb4ac2b0f9..f10bceee1bc65dd128abe5cd15846502546665b8 100755 (executable)
--- 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 64fe7dd5cb7addb7128031abc85b531ddd0a751f..8b4770e402f803993af4b69629536d9a8d9a092f 100644 (file)
--- 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.