mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 02:25:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge #12097: [scripts] lint-whitespace: use perl instead of grep -P

Browse Source 
40b17f5f9 [scripts] lint-whitespace: use perl instead of grep -P (Sjors Provoost)

Pull request description:

  MacOS does not support `grep -P` out of the box. This change makes
  it easier for developers to check for whitespace problems locally.

  Based on [this](https://stackoverflow.com/a/16658690) and [this](https://serverfault.com/a/504387) Stack Exchange answer.

  Tested with:
  ```sh
  export TRAVIS_COMMIT_RANGE='fe78c9a...62e0453'
  contrib/devtools/lint-whitespace.sh
  This diff appears to have added new lines with tab characters instead of spaces.
  The following changes were suspected:

  diff --git a/src/test/bignum_tests.cpp b/src/test/bignum_tests.cpp
  @@ -0,0 +1,110 @@
  +	num.setint64(n);
  ```

Tree-SHA512: 37c342a0ca2580289cf326a278a051a7c21ba918d6b2143fd9987f159fab85f1de3d770fcf532a642cd5d1957afc8595678128196e102dc473924758f133db7f
This commit is contained in:
Wladimir J. van der Laan 2018-03-06 23:09:27 +01:00
commit 14475e2dcd
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/devtools/lint-whitespace.sh
View File

@ -59,7 +59,7 @@ if showdiff | grep -E -q '^\+.*\s+$'; then
fi fi
# Check if tab characters were found in the diff. # Check if tab characters were found in the diff.
if showcodediff | grep -P -q '^\+.*\t'; then if showcodediff | perl -nle '$MATCH++ if m{^\+.*\t}; END{exit 1 unless $MATCH>0}' > /dev/null; then
echo "This diff appears to have added new lines with tab characters instead of spaces." echo "This diff appears to have added new lines with tab characters instead of spaces."
echo "The following changes were suspected:" echo "The following changes were suspected:"
FILENAME="" FILENAME=""
@ -81,7 +81,7 @@ if showcodediff | grep -P -q '^\+.*\t'; then
fi fi
echo "$line" echo "$line"
fi fi
done < <(showcodediff | grep -P '^(diff --git |@@|\+.*\t)') done < <(showcodediff | perl -nle 'print if m{^(diff --git |@@|\+.*\t)}')
RET=1 RET=1
fi fi