Merge remote-tracking branch 'origin/master' into windowswindows

Change-Id: I80edbceb67381ca1af2b19ef82ee08fc5b385909

1 files changed, 11 insertions, 2 deletions

diff --git a/git_hooks/pre-commit b/git_hooks/pre-commit
index 6ffc063..3de975b 100755
--- a/git_hooks/pre-commit
+++ b/git_hooks/pre-commit
@@ -19,7 +19,10 @@ fi
 #
 # Configuration check
 #
-XMLINDENT="$(git config --get hooks.xmlindent)"
+if test ! -x "$XMLINDENT"
+then
+    XMLINDENT="$(git config --get hooks.xmlindent)"
+fi
 if test ! -x "$XMLINDENT"
 then
     echo "Unable to find xmlindent executable on the configuration."
@@ -45,7 +48,10 @@ else
     XMLINDENT_IGNORED="$(find $(git config --get-all xmlindent.ignored))"
 fi
 
-ASTYLE="$(git config --get hooks.astyle)"
+if test ! -x "$ASTYLE"
+then
+    ASTYLE="$(git config --get hooks.astyle)"
+fi
 if test ! -x "$ASTYLE"
 then
     echo "Unable to find astyle executable on the configuration."
@@ -128,6 +134,9 @@ __indent_xml() {
 
     echo "Formatting" "$FILES"
     "$XMLINDENT" -w -i 4 $FILES || return 2;
+    # xmlindent does not remove trailing whitespaces
+    # and might add some on empty lines
+    sed -i -e 's/[ \t]*$//' $FILES || return 2;
     git add $FILES || return 3;
 }