From 3ca4b1c40f8f7184bee7ebd45785632480d17d41 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike@mikegerwitz.com>
Date: Sun, 22 Dec 2013 01:12:24 -0500
Subject: [PATCH] signchk tool now only checks merge commit (not the commits
 introduced) for signature

This greatly simplfies rebasing and other operations while working in a branch;
signing each and every commit that is not in master can be overkill (even if it
does give peace of mind).
---
 tools/signchk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/signchk b/tools/signchk
index 1ba0b9e..c99659d 100755
--- a/tools/signchk
+++ b/tools/signchk
@@ -28,7 +28,8 @@ chkafter="${1:-1b1790029}"
 
 # Check every commit after chkcommit (or all commits if chkcommit was not
 # provided) for a trusted signature, listing invalid commits. %G? will output
-# "G" if the signature is trusted.
+# "G" if the signature is trusted. In the case of a merge commit, the merge
+# commit itself need only be signed.
 t=$'\t'
-git log --pretty="format:%H %aN$t%s$t%G?" "$chkafter.." \
+git log --first-parent --pretty="format:%H %aN$t%s$t%G?" "$chkafter.." \
   | grep -v "${t}G$"