[FAB-7183] check_license misses some newly added files

This patch fixes the check_license script to detect new files in previous commits and also include cached files in local changes. The script wasn't properly detecting new files due to a reversal in the commit hashes in git diff-tree. Change-Id: I66f5e00f373edbae868dfa14cddb4daa0767e62a Signed-off-by: Troy Ronda <[email protected]>
hyperledger · Nov 29, 2017 · 84387d4 · 84387d4
1 parent 56638b7
commit 84387d4
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/scripts/check_license.sh b/scripts/check_license.sh
@@ -12,13 +12,12 @@ function filterExcludedFiles {
   | grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | sort -u`
 }
 
-CHECK=$(git diff --name-only HEAD --diff-filter=ACMRTUXB *)
+CHECK=$(git diff --name-only --diff-filter=ACMRTUXB HEAD)
 filterExcludedFiles
-
 if [[ -z "$CHECK" ]]; then
-  CHECK=$(git diff-tree --no-commit-id --name-only --diff-filter=ACMRTUXB -r $(git log -2 \
-    --pretty=format:"%h"))
-    filterExcludedFiles
+  LAST_COMMITS=($(git log -2 --pretty=format:"%h"))
+  CHECK=$(git diff-tree --no-commit-id --name-only --diff-filter=ACMRTUXB -r ${LAST_COMMITS[1]} ${LAST_COMMITS[0]})
+  filterExcludedFiles
 fi
 
 if [[ -z "$CHECK" ]]; then