Skip to content
Permalink
Browse files

Revert "Merge pull request #5461 from m-kuhn/less_temp_files"

This reverts commit cfad3aa, reversing
changes made to cdca708.
  • Loading branch information
3nids committed May 28, 2018
1 parent 4c3a9ef commit 034c3f0d75ae20f26bae551b9e5e323e92f1aa0e
Showing with 7 additions and 5 deletions.
  1. +0 −1 scripts/astyle.sh
  2. +7 −4 scripts/prepare-commit.sh
@@ -81,7 +81,6 @@ astyleit() {
scripts/doxygen_space.pl "$modified"
diff "$1" "$modified" >/dev/null || mv "$modified" "$1"
rm -f "$modified"
rm -f "$modified.sortinc"
}

for f in "$@"; do
@@ -91,19 +91,22 @@ for f in $MODIFIED; do

cp $f $m
ASTYLEPROGRESS=" [$i/$N]" astyle.sh $f
diff -u $m $f >>$ASTYLEDIFF
rm $m
if diff -u $m $f >>$ASTYLEDIFF; then
# no difference found
rm $m
fi
done

if [ -s "$ASTYLEDIFF" ]; then
if tty -s; then
# review astyle changes
colordiff <$ASTYLEDIFF | less -r
else
echo "Files changed"
echo "Files changed (see $ASTYLEDIFF)"
fi
else
rm $ASTYLEDIFF
fi
rm $ASTYLEDIFF


# verify SIP files

0 comments on commit 034c3f0

Please sign in to comment.
You can’t perform that action at this time.