Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Avoid prepare-commit script leaving temporary .diff files
(cherry-picked from 821241e)
  • Loading branch information
nyalldawson committed Jun 29, 2018
1 parent c409d5a commit a7aec56
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions scripts/prepare-commit.sh
Expand Up @@ -59,10 +59,11 @@ fi

if [[ -n "$QGIS_CHECK_SPELLING" && -x "${TOPLEVEL}"/scripts/spell_check/check_spelling.sh ]]; then "${TOPLEVEL}"/scripts/spell_check/check_spelling.sh "$MODIFIED"; fi

FILES_CHANGED=0

# save original changes
REV=$(git log -n1 --pretty=%H)
git diff >sha-"$REV".diff
#git diff >sha-"$REV".diff

ASTYLEDIFF=astyle.$REV.diff
true > "$ASTYLEDIFF"
Expand Down Expand Up @@ -101,9 +102,11 @@ if [ -s "$ASTYLEDIFF" ]; then
if tty -s; then
# review astyle changes
colordiff <"$ASTYLEDIFF" | less -r
rm "$ASTYLEDIFF"
else
echo "Files changed (see $ASTYLEDIFF)"
fi
FILES_CHANGED=1
else
rm "$ASTYLEDIFF"
fi
Expand Down Expand Up @@ -136,17 +139,15 @@ if [[ -s "$SIPIFYDIFF" ]]; then
if tty -s; then
# review astyle changes
colordiff <"$SIPIFYDIFF" | less -r
rm "$SIPIFYDIFF"
else
echo "Files changed (see $ASTYLEDIFF)"
fi
exit 1
FILES_CHANGED=1
else
rm "$SIPIFYDIFF"
fi
if [ -s "$ASTYLEDIFF" ]; then
exit 1
fi

exit 0
exit $FILES_CHANGED

# vim: set ts=2 expandtab :

0 comments on commit a7aec56

Please sign in to comment.