LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #10480: Improve commit-check-script.sh

Browse source 
5432fc3 Fail on commit with VERIFY SCRIPT but no scripted-diff (Pieter Wuille)

Tree-SHA512: 687b6c825f6f882f9c8e9d301bc893383710bad70216fa40b95f7e24d83a7148f9c759c3e4bd905a6cd26960829f8f6bd03106dc6c83ac312bf34ad239917018
This commit is contained in:
Wladimir J. van der Laan 2017-06-13 20:41:12 +02:00
commit fbf5d3ba15
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
contrib/devtools/commit-script-check.sh
View file

@ -20,7 +20,7 @@ RET=0
PREV_BRANCH=`git name-rev --name-only HEAD` PREV_BRANCH=`git name-rev --name-only HEAD`
PREV_HEAD=`git rev-parse HEAD` PREV_HEAD=`git rev-parse HEAD`
for i in `git rev-list --reverse $1`; do for i in `git rev-list --reverse $1`; do
git rev-list -n 1 --pretty="%s" $i | grep -q "^scripted-diff:" || continue if git rev-list -n 1 --pretty="%s" $i | grep -q "^scripted-diff:"; then
git checkout --quiet $i^ || exit git checkout --quiet $i^ || exit
SCRIPT="`git rev-list --format=%b -n1 $i | sed '/^-BEGIN VERIFY SCRIPT-$/,/^-END VERIFY SCRIPT-$/{//!b};d'`" SCRIPT="`git rev-list --format=%b -n1 $i | sed '/^-BEGIN VERIFY SCRIPT-$/,/^-END VERIFY SCRIPT-$/{//!b};d'`"
if test "x$SCRIPT" = "x"; then if test "x$SCRIPT" = "x"; then
@ -34,6 +34,13 @@ for i in `git rev-list --reverse $1`; do
git --no-pager diff --exit-code $i && echo "OK" || (echo "Failed"; false) || RET=1 git --no-pager diff --exit-code $i && echo "OK" || (echo "Failed"; false) || RET=1
fi fi
git reset --quiet --hard HEAD git reset --quiet --hard HEAD
else
if git rev-list "--format=%b" -n1 $i | grep -q '^-\(BEGIN\|END\)[ a-zA-Z]*-$'; then
echo "Error: script block marker but no scripted-diff in title"
echo "Failed"
RET=1
fi
fi
done done
git checkout --quiet $PREV_BRANCH 2>/dev/null || git checkout --quiet $PREV_HEAD git checkout --quiet $PREV_BRANCH 2>/dev/null || git checkout --quiet $PREV_HEAD
exit $RET exit $RET