You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: scripts/prepare-commit.sh
+7-6Lines changed: 7 additions & 6 deletions
Original file line number
Diff line number
Diff line change
@@ -59,10 +59,11 @@ fi
59
59
60
60
if [[ -n"$QGIS_CHECK_SPELLING"&&-x"${TOPLEVEL}"/scripts/spell_check/check_spelling.sh ]];then"${TOPLEVEL}"/scripts/spell_check/check_spelling.sh "$MODIFIED";fi
61
61
62
+
FILES_CHANGED=0
62
63
63
64
# save original changes
64
65
REV=$(git log -n1 --pretty=%H)
65
-
git diff >sha-"$REV".diff
66
+
#git diff >sha-"$REV".diff
66
67
67
68
ASTYLEDIFF=astyle.$REV.diff
68
69
true>"$ASTYLEDIFF"
@@ -96,9 +97,11 @@ if [ -s "$ASTYLEDIFF" ]; then
96
97
if tty -s;then
97
98
# review astyle changes
98
99
colordiff <"$ASTYLEDIFF"| less -r
100
+
rm "$ASTYLEDIFF"
99
101
else
100
102
echo"Files changed (see $ASTYLEDIFF)"
101
103
fi
104
+
FILES_CHANGED=1
102
105
else
103
106
rm "$ASTYLEDIFF"
104
107
fi
@@ -131,17 +134,15 @@ if [[ -s "$SIPIFYDIFF" ]]; then
0 commit comments