highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-10 14:08:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge #19654: lint: Don't use TRAVIS_COMMIT_RANGE in commit message linter

Browse Source 
72351784b3 lint: Remove travis env var from commit linter (Fabian Jahr)

Pull request description:

  #19439 was recently merged and seemed to work fine but I now noticed strange behavior when it was running in Travis, which I could not reproduce locally. It turns out `TRAVIS_COMMIT_RANGE` which is used in Travis to get the commits for the linter, uses all the commits that were in a push, which includes all rebase commits for example. This means that the linter can fail on a commit that the developer has never even seen before, which can be very confusing. See an example here which caused me to look into this: https://travis-ci.org/github/bitcoin/bitcoin/jobs/714296381 The commit that is reported as failing in my PR is not part of my PR.

  I think we rather want to use something like `git merge-base` to get the commit range by default and in Travis. I am leaving the env variable functionality in place with a different name but this is not a variable that can be expected to be present in the CI environments so the `merge-base` range should be used there by default.

ACKs for top commit:
  hebasto:
    ACK 72351784b3, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: afb27bb386855cb8d5cf84fd3a6c11ef1160b25af6175ed0aa146bf04b9a26eb77298df70df0a855f8c46f19f08b3f62c49872c12974fcfa5526a15ee05b3c10
This commit is contained in:
MarcoFalke
2020-08-05 10:45:30 +02:00
parent 0f16212c59 72351784b3
commit 65e4ecabd5
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/lint/lint-git-commit-check.sh
View File

@@ -14,21 +14,22 @@ while getopts "?" opt; do
case $opt in case $opt in
?) ?)
echo "Usage: $0 [N]" echo "Usage: $0 [N]"
echo " TRAVIS_COMMIT_RANGE='<commit range>' $0" echo " COMMIT_RANGE='<commit range>' $0"
echo " $0 -?" echo " $0 -?"
echo "Checks unmerged commits, the previous N commits, or a commit range." echo "Checks unmerged commits, the previous N commits, or a commit range."
echo "TRAVIS_COMMIT_RANGE='47ba2c3...ee50c9e' $0" echo "COMMIT_RANGE='47ba2c3...ee50c9e' $0"
exit ${EXIT_CODE} exit ${EXIT_CODE}
;; ;;
esac esac
done done
if [ -z "${TRAVIS_COMMIT_RANGE}" ]; then if [ -z "${COMMIT_RANGE}" ]; then
if [ -n "$1" ]; then if [ -n "$1" ]; then
TRAVIS_COMMIT_RANGE="HEAD~$1...HEAD" COMMIT_RANGE="HEAD~$1...HEAD"
else else
TRAVIS_COMMIT_RANGE="origin/master..HEAD" MERGE_BASE=$(git merge-base HEAD master)
fi COMMIT_RANGE="$MERGE_BASE..HEAD"
fi
fi fi
while IFS= read -r commit_hash || [[ -n "$commit_hash" ]]; do while IFS= read -r commit_hash || [[ -n "$commit_hash" ]]; do
@@ -41,6 +42,6 @@ while IFS= read -r commit_hash || [[ -n "$commit_hash" ]]; do
EXIT_CODE=1 EXIT_CODE=1
fi fi
done < <(git log --format=%B -n 1 "$commit_hash") done < <(git log --format=%B -n 1 "$commit_hash")
done < <(git log "${TRAVIS_COMMIT_RANGE}" --format=%H) done < <(git log "${COMMIT_RANGE}" --format=%H)
exit ${EXIT_CODE} exit ${EXIT_CODE}