diff options
| author | Matt Corallo <[email protected]> | 2017-01-31 14:59:32 -0500 |
|---|---|---|
| committer | Matt Corallo <[email protected]> | 2017-02-01 18:22:27 -0500 |
| commit | 3e900acafaa2d40218d8b6167f1a80affd84c8c4 (patch) | |
| tree | fbda39c30b410283bd42b58c2db7ef872dc63b13 /src/validation.cpp | |
| parent | Merge #9625: Increase minimum debug.log size to 10MB after shrink. (diff) | |
| download | discoin-3e900acafaa2d40218d8b6167f1a80affd84c8c4.tar.xz discoin-3e900acafaa2d40218d8b6167f1a80affd84c8c4.zip | |
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 'src/validation.cpp')
0 files changed, 0 insertions, 0 deletions