diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-07 18:47:17 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-07 18:48:27 +0200 |
| commit | b2e5fe8b559b2f6561ee8f220e9141e401929f5e (patch) | |
| tree | 13a4261192d527911a77061cde3fe7ec6b63c971 /src/init.cpp | |
| parent | f8d6dc47cbe7b65f05eb9e77e9e8b19659c25831 (diff) | |
| parent | 577f11141c5155345c68809aac8511b018cc4050 (diff) | |
| download | bitcoin-b2e5fe8b559b2f6561ee8f220e9141e401929f5e.tar.xz | |
Merge #12708: Make verify-commits.sh test that merges are clean
577f111 Make verify-commits.sh test that merges are clean (Pieter Wuille)
Pull request description:
Unsure if we want this.
This modifies verify-commits.sh to redo all merges along the leftmost commit branch (which includes all PR merges), and verify whether they match the merge commit's trees.
The benefit is that it will detect a case where one of the maintainers merges a PR, but makes an unrelated change inside the merge commit. This on itself is not very strong, as unrelated changes can also be included in the merged branch itself - but perhaps the merge commit is not something that people are otherwise likely to look at.
Fixes #8089
Tree-SHA512: 2c020f5ac3f771ac775aa726832916bb8e03a311b2745d7a9825047239bd0660d838f086f3456f2bb05cea14c1529f74436b8cdd74cc94b70e40b4617309f62c
Diffstat (limited to 'src/init.cpp')
0 files changed, 0 insertions, 0 deletions