diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-11-08 09:31:53 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-11-08 09:32:11 +0100 |
| commit | c86f546f98ed1019c76c14ca4f8b69a4ee62f27c (patch) | |
| tree | 9f58a158b0fc7406e1afe00b322535b3d2190289 | |
| parent | f075e83b8152969cadd70ccd5b41e23d07dbabba (diff) | |
| parent | 095f07744cf500adc1f1587eb5b7a61df6e6b05f (diff) | |
Merge bitcoin/bitcoin#23458: ci: Do not print `git log` for empty COMMIT_RANGE
095f07744cf500adc1f1587eb5b7a61df6e6b05f ci: Do not print `git log` for empty COMMIT_RANGE (Hennadii Stepanov)
Pull request description:
On master (77a2f5d30c5ecb764b8a7c098492e1f5cdec90f0) a CI lint task [log](https://api.cirrus-ci.com/v1/task/4817858858319872/logs/lint.log) exceeds 20K lines.
This PR fixes this issue.
ACKs for top commit:
MarcoFalke:
cr ACK 095f07744cf500adc1f1587eb5b7a61df6e6b05f
Tree-SHA512: 89180018aeccf1599cdf218924cbab12dcbae0f6674bb90e13b64e342cdd908a880b885039c23f0d1d03493e55a94fe04abf39481616ae6550c6a759f5ca9a35
| -rwxr-xr-x | ci/lint/06_script.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ci/lint/06_script.sh b/ci/lint/06_script.sh index f7dacd8512..11dda51d2d 100755 --- a/ci/lint/06_script.sh +++ b/ci/lint/06_script.sh @@ -8,8 +8,8 @@ export LC_ALL=C GIT_HEAD=$(git rev-parse HEAD) if [ -n "$CIRRUS_PR" ]; then - COMMIT_RANGE="$CIRRUS_BASE_SHA..$GIT_HEAD" - test/lint/commit-script-check.sh $COMMIT_RANGE + COMMIT_RANGE="${CIRRUS_BASE_SHA}..$GIT_HEAD" + test/lint/commit-script-check.sh "$COMMIT_RANGE" fi export COMMIT_RANGE @@ -34,5 +34,7 @@ if [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] && [ "$CIRRUS_PR" = "" ] ; t ./contrib/verify-commits/verify-commits.py; fi -echo -git log --no-merges --oneline $COMMIT_RANGE +if [ -n "$COMMIT_RANGE" ]; then + echo + git log --no-merges --oneline "$COMMIT_RANGE" +fi |