Skip to content

Commit

Permalink
Merge #20069: test: Mention commit id in scripted diff error
Browse files Browse the repository at this point in the history
3491bf3 test: Mention commit id in scripted diff error (Wladimir J. van der Laan)

Pull request description:

  Add commit id to make spotting the issue easier.

ACKs for top commit:
  robot-dreams:
    ACK 3491bf3
  sipa:
    utACK 3491bf3
  hebasto:
    ~ACK~ Concept ACK 3491bf3, should help in situations like https://travis-ci.org/github/bitcoin/bitcoin/jobs/732481553

Tree-SHA512: 1ae66fa760f9e5d52e029bae71f6b5863f1efd7b95de3723ea09290944c9d7687f5ec6927aa115a3aebd6f2b993baa0c2433975c6ad5cd2858089013362eb599
  • Loading branch information
MarcoFalke committed Oct 4, 2020
2 parents 06314fb + 3491bf3 commit 2f7a53c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/lint/commit-script-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ for commit in $(git rev-list --reverse $1); do
git reset --quiet --hard HEAD
else
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 of commit $commit"
echo "Failed"
RET=1
fi
Expand Down

0 comments on commit 2f7a53c

Please sign in to comment.