Skip to content

Commit c86f546

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#23458: ci: Do not print git log for empty COMMIT_RANGE
095f077 ci: Do not print `git log` for empty COMMIT_RANGE (Hennadii Stepanov) Pull request description: On master (77a2f5d) 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 095f077 Tree-SHA512: 89180018aeccf1599cdf218924cbab12dcbae0f6674bb90e13b64e342cdd908a880b885039c23f0d1d03493e55a94fe04abf39481616ae6550c6a759f5ca9a35
2 parents f075e83 + 095f077 commit c86f546

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

ci/lint/06_script.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ export LC_ALL=C
88

99
GIT_HEAD=$(git rev-parse HEAD)
1010
if [ -n "$CIRRUS_PR" ]; then
11-
COMMIT_RANGE="$CIRRUS_BASE_SHA..$GIT_HEAD"
12-
test/lint/commit-script-check.sh $COMMIT_RANGE
11+
COMMIT_RANGE="${CIRRUS_BASE_SHA}..$GIT_HEAD"
12+
test/lint/commit-script-check.sh "$COMMIT_RANGE"
1313
fi
1414
export COMMIT_RANGE
1515

@@ -34,5 +34,7 @@ if [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] && [ "$CIRRUS_PR" = "" ] ; t
3434
./contrib/verify-commits/verify-commits.py;
3535
fi
3636

37-
echo
38-
git log --no-merges --oneline $COMMIT_RANGE
37+
if [ -n "$COMMIT_RANGE" ]; then
38+
echo
39+
git log --no-merges --oneline "$COMMIT_RANGE"
40+
fi

0 commit comments

Comments
 (0)