diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index c1ea7d363..0bc70f648 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -229,7 +229,7 @@ Rich O'Connell Robert Coup Robert Roldan Ruslan Gibaiev -SiuFay +Russell Ballard Sairam Polavarapu Sanjay Kr Singh Sanne Grinovero @@ -245,6 +245,7 @@ Sheldon Fuchs Shivam Sharma Shubham Rawat Shuguang Xiang +SiuFay Siddhant Agnihotry Stanley Shyiko Stathis Souris diff --git a/jenkins-jobs/scripts/check-contributors.sh b/jenkins-jobs/scripts/check-contributors.sh index 62836b3ca..f305af011 100755 --- a/jenkins-jobs/scripts/check-contributors.sh +++ b/jenkins-jobs/scripts/check-contributors.sh @@ -5,6 +5,7 @@ CONTRIBUTOR_NAMES="/tmp/repository-CONTRIBUTOR-NAMES.txt" CONTRIBUTORS="/tmp/repository-CONTRIBUTORS.txt" FILTERS="jenkins-jobs/scripts/config/FilteredNames.txt" +FILTERED_COMMITS="jenkins-jobs/scripts/config/FilteredCommits.txt" ALIASES="jenkins-jobs/scripts/config/Aliases.txt" declare -a DEBEZIUM_REPOS @@ -42,8 +43,11 @@ do # If it did resolve as an alias, use the resolved name to see if its in the COPYRIGHT file # and return 1 only if the resolved name was not already listed. if test -z "$NAME"; then - echo "Commit $(git log --pretty=format:"%H" --author "$LINE" | head -1) : Did not find [$LINE] with email [$EMAIL]." + COMMIT=`git --git-dir=../"$REPO"/.git log --pretty=format:"%H" --author "$LINE" | head -1` + if ! grep -qi "$COMMIT" "$FILTERED_COMMITS"; then + echo "Commit $COMMIT : Did not find [$LINE] with email [$EMAIL]." rc=1 + fi else if ! grep -qi "$NAME" $COPYRIGHT; then echo "Found [$LINE] (translated to [$NAME]) but the name wasn't in the COPYRIGHT.txt file." diff --git a/jenkins-jobs/scripts/config/FilteredCommits.txt b/jenkins-jobs/scripts/config/FilteredCommits.txt new file mode 100644 index 000000000..558094e9c --- /dev/null +++ b/jenkins-jobs/scripts/config/FilteredCommits.txt @@ -0,0 +1 @@ +21434c748d5464d09d4a0abb4c953199b3f75ec4 \ No newline at end of file