From ae064874bcb9c31c8cae254cb7c35f65a2a15fe6 Mon Sep 17 00:00:00 2001 From: Andrew Poelstra Date: Fri, 4 Dec 2020 01:54:57 +0000 Subject: [PATCH] travis: temporarily blacklist a specific commit in the `scripted-diff` filter Commit f471a3be00c2b6433b8c258b716982c0539da13f currently has the text "scripted diff" rather than "scripted-diff", which causes the scripted-diff linter to fail, saying that it sees a script but not the magic words. Changing the linter to detect "scripted diff" causes it to fail on this commit, because the included script does not work. (For reference, the script is r() { sed -i 's/vout must be positive/vout cannot be negative/g' $1 } r $(git grep -l 'vout must be positive') Bet you can't guess why bash rejects this without running it!) We should remember to change this back. --- test/lint/commit-script-check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/lint/commit-script-check.sh b/test/lint/commit-script-check.sh index 827c978bed..6c4705c22e 100755 --- a/test/lint/commit-script-check.sh +++ b/test/lint/commit-script-check.sh @@ -35,7 +35,7 @@ for commit in $(git rev-list --reverse $1); do git --no-pager diff --exit-code $commit && echo "OK" || (echo "Failed"; false) || RET=1 fi git reset --quiet --hard HEAD - else + elif [ "$commit" != "f471a3be00c2b6433b8c258b716982c0539da13f" ]; 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 of commit $commit" echo "Failed"