scripted-diff: Run scripted-diff in subshell

-BEGIN VERIFY SCRIPT-
sed -i 's/\bi\b/commit/g' test/lint/commit-script-check.sh
sed -i '34s/eval "$SCRIPT"/(eval "$SCRIPT")/' test/lint/commit-script-check.sh
-END VERIFY SCRIPT-
pull/643/head
Carl Dong 6 years ago
parent c62b151189
commit 43f9099901

@ -20,23 +20,23 @@ fi
RET=0 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 commit in `git rev-list --reverse $1`; do
if git rev-list -n 1 --pretty="%s" $i | grep -q "^scripted-diff:"; then if git rev-list -n 1 --pretty="%s" $commit | grep -q "^scripted-diff:"; then
git checkout --quiet $i^ || exit git checkout --quiet $commit^ || 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 $commit | sed '/^-BEGIN VERIFY SCRIPT-$/,/^-END VERIFY SCRIPT-$/{//!b};d'`"
if test "x$SCRIPT" = "x"; then if test "x$SCRIPT" = "x"; then
echo "Error: missing script for: $i" echo "Error: missing script for: $commit"
echo "Failed" echo "Failed"
RET=1 RET=1
else else
echo "Running script for: $i" echo "Running script for: $commit"
echo "$SCRIPT" echo "$SCRIPT"
eval "$SCRIPT" (eval "$SCRIPT")
git --no-pager diff --exit-code $i && echo "OK" || (echo "Failed"; false) || RET=1 git --no-pager diff --exit-code $commit && echo "OK" || (echo "Failed"; false) || RET=1
fi fi
git reset --quiet --hard HEAD git reset --quiet --hard HEAD
else else
if git rev-list "--format=%b" -n1 $i | grep -q '^-\(BEGIN\|END\)[ a-zA-Z]*-$'; then if git rev-list "--format=%b" -n1 $commit | grep -q '^-\(BEGIN\|END\)[ a-zA-Z]*-$'; then
echo "Error: script block marker but no scripted-diff in title" echo "Error: script block marker but no scripted-diff in title"
echo "Failed" echo "Failed"
RET=1 RET=1

Loading…
Cancel
Save