Browse Source

pre-commit hook: don't unstage the entire file containing a style issue

master
Matthias Grob 3 years ago committed by Daniel Agar
parent
commit
4454fe9770
  1. 2
      Tools/astyle/check_code_style.sh

2
Tools/astyle/check_code_style.sh

@ -16,8 +16,6 @@ if [ -f "$FILE" ]; then
if [[ $PX4_ASTYLE_FIX -eq 1 ]]; then if [[ $PX4_ASTYLE_FIX -eq 1 ]]; then
${DIR}/fix_code_style.sh $FILE ${DIR}/fix_code_style.sh $FILE
else else
# Make sure this file is not staged for comitting
git reset $FILE
# Provide instructions # Provide instructions
echo $FILE 'bad formatting, please run "make format" or "./Tools/astyle/fix_code_style.sh' $FILE'"' echo $FILE 'bad formatting, please run "make format" or "./Tools/astyle/fix_code_style.sh' $FILE'"'
exit 1 exit 1

Loading…
Cancel
Save