test: Ignore merge commits in signoff check

Change-Id: I205b7ec523eaf7576513f0ca3edb2bddea43b6ce
Signed-off-by: Greg Tucker <greg.b.tucker@intel.com>
This commit is contained in:
Greg Tucker
2018-12-20 16:18:19 -07:00
parent cb1b7bb664
commit ce9f3923da

View File

@@ -76,7 +76,7 @@ done <<< $(git ls-files -s '*.sh')
echo "Checking for signoff in commit message..."
if ! git log -n 1 --format=%B | grep -q "^Signed-off-by:" ; then
if ! git log -n 1 --format=%B --no-merges | grep -q "^Signed-off-by:" ; then
echo " Commit not signed off. Please read src/CONTRIBUTING.md"
rc=1
fi