stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

style: Make uncrustify silent

Browse source
This commit is contained in:
Snaipe 2016-09-05 22:13:23 +02:00
parent f32a46694a
commit fff1d0a168
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.githooks/pre-commit
View file

@ -140,7 +140,7 @@ do
# +++ - timestamp # +++ - timestamp
# to both lines working on the same file and having a a/ and b/ prefix. # to both lines working on the same file and having a a/ and b/ prefix.
# Else it can not be applied with 'git apply'. # Else it can not be applied with 'git apply'.
"$UNCRUSTIFY" -c "$CONFIG" -f "$file" $language_option | \ "$UNCRUSTIFY" -q -c "$CONFIG" -f "$file" $language_option | \
git --no-pager diff --color=always --no-index -- "$file" - | \ git --no-pager diff --color=always --no-index -- "$file" - | \
sed -e "1s|--- $file_escaped_source|--- \"a/$file_escaped_target\"|" -e "2s|+++ -|+++ \"b/$file_escaped_target\"|" >> "$patch" sed -e "1s|--- $file_escaped_source|--- \"a/$file_escaped_target\"|" -e "2s|+++ -|+++ \"b/$file_escaped_target\"|" >> "$patch"
done done

4
.travis.yml
View file

@ -50,8 +50,8 @@ matrix:
- export STYLE_OK=true - export STYLE_OK=true
- > - >
for f in $SOURCES; do for f in $SOURCES; do
if ! uncrustify --check -c .uncrustify.cfg $f; then if ! uncrustify -q --check -c .uncrustify.cfg $f; then
uncrustify -c .uncrustify.cfg -f $f | git --no-pager diff --no-index --color=always $f - uncrustify -q -c .uncrustify.cfg -f $f | git --no-pager diff --no-index --color=always $f -
export STYLE_OK=false export STYLE_OK=false
fi fi
done done