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

Merge #14864: test: Run scripted-diff in subshell

Browse source 
43f9099901 scripted-diff: Run scripted-diff in subshell (Carl Dong)

Pull request description:

  scripted-diffs should be run in subshells so that their execution does not
  affect the shell variables of commit-script-check. Shell variables are not
  unset before evaluating the scripted-diff, so that they might be used in
  the subshell. To this end, the variable previously named i is now more
  descriptively named commit, this also allows scripted-diffs to use the
  commonly used variable i without fear of losing a reference to the
  commit.

Tree-SHA512: 0d86c069c2a978ca07d71bcd2b1b273e9bfabfe7e31a50c7b1b860e04f178b81c65814c3a38fb01e50b41a5065b646f0dab5b05d9be71138e72d4baba607e37b
This commit is contained in:
Wladimir J. van der Laan 2018-12-06 15:30:37 +01:00
commit 1858e6f2f2
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
test/lint/commit-script-check.sh
View file

@ -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