Skip to content

Commit

Permalink
tools: ignore merge commits in signoff check
Browse files Browse the repository at this point in the history
Signed-off-by: Pablo de Lara <[email protected]>
  • Loading branch information
pablodelara authored and tkanteck committed Mar 22, 2024
1 parent eeb37dc commit 86090be
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/check_format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,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
hash=`git rev-parse --short HEAD`
echo " Commit $hash not signed off. Please read src/CONTRIBUTING.md"
rc=1
Expand Down

0 comments on commit 86090be

Please sign in to comment.