| commit | 6e4e98ee8ce2da3cca2e2fd210e9e8dbc9b1c936 | |
| author | MarcoFalke <falke.marco@gmail.com> | |
| Thu, 9 Nov 2017 22:06:15 +0000 (9 17:06 -0500) | ||
| committer | MarcoFalke <falke.marco@gmail.com> | |
| Thu, 9 Nov 2017 22:06:20 +0000 (9 17:06 -0500) | ||
| tree | 46edfb42d273bf038ee94fa8b3fa6682b406cea7 | treesnapshot (tar.gz zip) |
| parent | c838283ecdfb9490425bb071b7c22e542de46c7c | commitdiff |
| parent | 487aff42184117ae3b8be4381b77587448e297a5 | commitdiff |
Merge #11394: Perform a weaker subtree check in Travis
487aff421 Check subtree consistency in Travis (Pieter Wuille)
e1d0cc23a Improve git-subtree-check.sh (Pieter Wuille)
Pull request description:
Apparently many of our subtrees get modified by PRs in this repository, without getting noticed.
To improve upon this:
* Make git-subtree-check.sh capable of doing a weaker consistency check (that doesn't need access to external repositories), but which should be sufficient to detect unintended changes. It can be fooled by a fake subtree merge commit, but that would hopefully be obvious to reviewers.
* Make Travis invoke this subtree check for each of our subtrees.
Note that Travis is currently expected to fail on this PR, as 2 out of 4 subtrees (`src/secp156k1` and `src/univalue` have been modified directly in master).
Tree-SHA512: 465b680392d3daf38a8c1dda77d6f74b1d1c23324c378774777fb95aa673e119a8f7e3ccc124e41d97b5ac8975f3d79f3015797d2d309666582394364917ec4e
487aff421 Check subtree consistency in Travis (Pieter Wuille)
e1d0cc23a Improve git-subtree-check.sh (Pieter Wuille)
Pull request description:
Apparently many of our subtrees get modified by PRs in this repository, without getting noticed.
To improve upon this:
* Make git-subtree-check.sh capable of doing a weaker consistency check (that doesn't need access to external repositories), but which should be sufficient to detect unintended changes. It can be fooled by a fake subtree merge commit, but that would hopefully be obvious to reviewers.
* Make Travis invoke this subtree check for each of our subtrees.
Note that Travis is currently expected to fail on this PR, as 2 out of 4 subtrees (`src/secp156k1` and `src/univalue` have been modified directly in master).
Tree-SHA512: 465b680392d3daf38a8c1dda77d6f74b1d1c23324c378774777fb95aa673e119a8f7e3ccc124e41d97b5ac8975f3d79f3015797d2d309666582394364917ec4e
| .travis.yml | diff1 | diff2 | blobhistory |
| contrib/devtools/git-subtree-check.sh | diff1 | diff2 | blobhistory |