diff options
| author | Matt Corallo <git@bluematt.me> | 2017-01-31 14:59:32 -0500 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2017-02-01 18:22:27 -0500 |
| commit | 3e900acafaa2d40218d8b6167f1a80affd84c8c4 (patch) | |
| tree | fbda39c30b410283bd42b58c2db7ef872dc63b13 /contrib | |
| parent | 77bd8c4cab67b6df6a09f856534653c7e064d6ec (diff) | |
Require merge commits merge branches on top of other merge commits
Specifically, require that the left branch (first restult of git
show -s --format=format:%P) is a signed merge commit, instead of
allowing either. This is fine for now, but might need to be relaxed
in the future.
Also fixes an out-of-file-descriptors issue by holding too many
open FDs writing to /dev/null
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/verify-commits/verify-commits.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh index cfe4f11a0b..b2cebdf1a0 100755 --- a/contrib/verify-commits/verify-commits.sh +++ b/contrib/verify-commits/verify-commits.sh @@ -28,9 +28,10 @@ IS_SIGNED () { local PARENTS PARENTS=$(git show -s --format=format:%P $1) for PARENT in $PARENTS; do - if IS_SIGNED $PARENT > /dev/null; then + if IS_SIGNED $PARENT; then return 0; fi + break done if ! "$HAVE_FAILED"; then echo "No parent of $1 was signed with a trusted key!" > /dev/stderr |