aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2017-01-31 14:59:32 -0500
committerMatt Corallo <git@bluematt.me>2017-02-01 18:22:27 -0500
commit3e900acafaa2d40218d8b6167f1a80affd84c8c4 (patch)
treefbda39c30b410283bd42b58c2db7ef872dc63b13 /.travis.yml
parent77bd8c4cab67b6df6a09f856534653c7e064d6ec (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 '.travis.yml')
0 files changed, 0 insertions, 0 deletions