Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#31063: lint: commit-script-check.sh: echo to st…
Browse files Browse the repository at this point in the history
…derr

fac6cfe lint: commit-script-check.sh: echo to stderr (MarcoFalke)

Pull request description:

  This makes it easier to redirect the produced `git diff` on failure. On success, it shouldn't hurt, because the same output is still present, just on stderr.

  Can be tested by introducing a fault in any scripted diff and then calling `commit-script-check.sh HEAD~..HEAD > any_file.txt`. Previously the file contained the full output, now it contains just the diff.

ACKs for top commit:
  TheCharlatan:
    ACK fac6cfe

Tree-SHA512: b4dfad10a4a902729a7ad7533ed0ef86b9e79761083f2ec623d448a551462b268fe04bdba387ca62160dae9ef7b1781e005dec60f18b111d9bfa6b97357108e6
  • Loading branch information
fanquake committed Oct 21, 2024
2 parents e8f72ae + fac6cfe commit 0e9f206
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions test/lint/commit-script-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@ for commit in $(git rev-list --reverse "$1"); do
git checkout --quiet "$commit"^ || exit
SCRIPT="$(git rev-list --format=%b -n1 "$commit" | sed '/^-BEGIN VERIFY SCRIPT-$/,/^-END VERIFY SCRIPT-$/{//!b};d')"
if test -z "$SCRIPT"; then
echo "Error: missing script for: $commit"
echo "Failed"
echo "Error: missing script for: $commit" >&2
echo "Failed" >&2
RET=1
else
echo "Running script for: $commit"
echo "$SCRIPT"
echo "Running script for: $commit" >&2
echo "$SCRIPT" >&2
(eval "$SCRIPT")
git --no-pager diff --exit-code "$commit" && echo "OK" || (echo "Failed"; false) || RET=1
git --no-pager diff --exit-code "$commit" && echo "OK" >&2 || (echo "Failed" >&2; false) || RET=1
fi
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 of commit $commit"
echo "Failed"
echo "Error: script block marker but no scripted-diff in title of commit $commit" >&2
echo "Failed" >&2
RET=1
fi
fi
Expand Down

0 comments on commit 0e9f206

Please sign in to comment.