diff options
| author | MarcoFalke <[email protected]> | 2018-02-15 19:27:42 -0500 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2018-02-15 19:27:44 -0500 |
| commit | a233fb4f1d037e68ff70eef3a9f5b7bf1d631918 (patch) | |
| tree | d2aaed69bfd2988e9abf9b81e3d6bf86e5f856c9 | |
| parent | Merge #12427: Make signrawtransaction accept P2SH-P2WSH redeemscripts (diff) | |
| parent | devtools: Exclude patches from lint-whitespace (diff) | |
| download | discoin-a233fb4f1d037e68ff70eef3a9f5b7bf1d631918.tar.xz discoin-a233fb4f1d037e68ff70eef3a9f5b7bf1d631918.zip | |
Merge #12442: devtools: Exclude patches from lint-whitespace
fafbf7f74e devtools: Exclude patches from lint-whitespace (MarcoFalke)
Pull request description:
By default, unified patches have trailing whitespace in all context lines. Thus, exclude patches from linting.
Tree-SHA512: 8f89f1584581e94dd4e34bd522cba21602bafe7933b4631a3abc5da5a8f25568810862d696618fe63c15edf3e046869ad5077d09373f09792985503c6a415538
| -rwxr-xr-x | contrib/devtools/lint-whitespace.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/devtools/lint-whitespace.sh b/contrib/devtools/lint-whitespace.sh index 989923f31..af9a57910 100755 --- a/contrib/devtools/lint-whitespace.sh +++ b/contrib/devtools/lint-whitespace.sh @@ -16,7 +16,7 @@ if [ -z "${TRAVIS_COMMIT_RANGE}" ]; then fi showdiff() { - if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- "." ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/"; then + if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- "." ":(exclude)depends/patches/" ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/"; then echo "Failed to get a diff" exit 1 fi |