From ce9f3923da42757c9326973a73ad5314d6aaf115 Mon Sep 17 00:00:00 2001 From: Greg Tucker Date: Thu, 20 Dec 2018 16:18:19 -0700 Subject: [PATCH] test: Ignore merge commits in signoff check Change-Id: I205b7ec523eaf7576513f0ca3edb2bddea43b6ce Signed-off-by: Greg Tucker --- tools/check_format.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/check_format.sh b/tools/check_format.sh index 019411e..d32014b 100755 --- a/tools/check_format.sh +++ b/tools/check_format.sh @@ -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