Commit bc2f3064 authored by Hugh Davenport's avatar Hugh Davenport

Fix error with makefile with coding standards check

During a make push with one of the academy student patches, they got
the error http://paste.dollyfish.net.nz/ea833c with patch
https://reviews.mahara.org/#/c/4176/2

Going through, it looks like it was in the check for the coding
standards and they had a branch? called that for some reason. I'll
check in a bit when I verify.

Added -- to seperate git arguments from filenames to fix this.

Change-Id: I36b400cff115977ebb888ced57ba7fbbb3a3fcc0
parent 913a990d
......@@ -44,7 +44,7 @@ ifdef revision
@find htdocs -type f -name "*.php" -print0 | xargs -0 -n 1 -P 2 php -l > /dev/null && echo All good!
@php test/versioncheck.php
@find htdocs -type f -name "install.xml" -path "*/db/install.xml" -print0 | xargs -0 -n 1 -P 2 xmllint --schema htdocs/lib/xmldb/xmldb.xsd --noout
@git diff-tree --diff-filter=ACMR --no-commit-id --name-only -r $(revision) | xargs -I {} find {} $(whitelist) | xargs -I list git show $(revision) list | test/coding-standard-check.pl
@git diff-tree --diff-filter=ACMR --no-commit-id --name-only -r $(revision) | xargs -I {} find {} $(whitelist) | xargs -I list git show $(revision) -- list | test/coding-standard-check.pl
else
@echo "No revision found!"
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment