diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-14 16:15:54 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-14 16:16:59 +0100 |
| commit | 845838c4451ecd1f7e988e7538a4d82f80b73670 (patch) | |
| tree | 183ce105b525a58a453c5f0784347fc5b430d9f5 /contrib | |
| parent | 46ca8f383e53a3cf93d7ea9425e55ef972e8939b (diff) | |
| parent | f3b8d85b4ba8945eb811851d83bbaef6a7583879 (diff) | |
| download | bitcoin-845838c4451ecd1f7e988e7538a4d82f80b73670.tar.xz | |
Merge #12636: backport: #11995 Fix Qt build with Xcode 9
f3b8d85 devtools: Exclude patches from lint-whitespace GitHub-Pull: #12442 Rebased-From: fafbf7f (MarcoFalke)
686cb86 [Depends] Fix Qt build with Xcode 9.2 (fanquake)
Pull request description:
GitHub-Pull: #11995
Rebased-From: 2b1f794
Tree-SHA512: 73d1c0a87fd135f3ad8bb737b97037ef047e582c41a7473833e82776957caf372fcd0caa764fc4eed792e9998e214ae829bad5535db6d589827085a74b0fa6f4
Diffstat (limited to 'contrib')
| -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 989923f31a..af9a57910a 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 |