Merge #12098: [scripts] lint-whitespace: add param to check last N commits

8dbf740f8 [scripts] lint-whitespace: check last N commits or unstaged changes (Sjors Provoost)

Pull request description:

  E.g. before you push three commits to Github and upset Travis, check if you didn't make any whitespace mistakes:
  ```sh
  contrib/devtools/lint-whitespace.sh 3
  ```

  This is slightly more convenient than doing:
  ```sh
  TRAVIS_COMMIT_RANGE=HEAD~3...HEAD contrib/devtools/lint-whitespace.sh
  ```

Tree-SHA512: 5d9c1ae978ccbe59477e8cf53391e9bd697d2da87f417a2519264af560d4768138e0b2d320dd497a1f1e704e18ab279d724f523b57c17a80ccd753133a5445bf
This commit is contained in:
Wladimir J. van der Laan 2018-03-06 23:14:06 +01:00 committed by Pasta
parent a88ad9384f
commit e9b42fd5c3
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984

View File

@ -7,12 +7,26 @@
# Check for new lines in diff that introduce trailing whitespace. # Check for new lines in diff that introduce trailing whitespace.
# We can't run this check unless we know the commit range for the PR. # We can't run this check unless we know the commit range for the PR.
while getopts "?" opt; do
case $opt in
?)
echo "Usage: .lint-whitespace.sh [N]"
echo " COMMIT_RANGE='<commit range>' .lint-whitespace.sh"
echo " .lint-whitespace.sh -?"
echo "Checks unstaged changes, the previous N commits, or a commit range."
echo "COMMIT_RANGE='47ba2c3...ee50c9e' .lint-whitespace.sh"
exit 0
;;
esac
done
if [ -z "${COMMIT_RANGE}" ]; then if [ -z "${COMMIT_RANGE}" ]; then
echo "Cannot run lint-whitespace.sh without commit range. To run locally, use:" if [ "$1" ]; then
echo "COMMIT_RANGE='<commit range>' .lint-whitespace.sh" COMMIT_RANGE="HEAD~$1...HEAD"
echo "For example:" else
echo "COMMIT_RANGE='47ba2c3...ee50c9e' .lint-whitespace.sh" COMMIT_RANGE="HEAD"
exit 1 fi
fi fi
showdiff() { showdiff() {