eb074fdb24
We have several pieces of information about subtrees: 1) What their current directory contents is 2) What their directory contents was at the time of the last subtree merge 3) What the directory contents of the upstream project is in the commit referred to by the subtree merge. Normally, all 3 should be identical. git-subtree-check.sh so far only compared (1) with (3) however. Fix this by comparing all three, and give some more useful diff output in the case of mismatch. The added benefit is that (1) and (2) can be compared without needing to see the upstream repository. |
||
|---|---|---|
| .. | ||
| README.md | ||
| commit-script-check.sh | ||
| git-subtree-check.sh | ||
| lint-all.sh | ||
| lint-include-guards.sh | ||
| lint-includes.sh | ||
| lint-locale-dependence.sh | ||
| lint-python-utf8-encoding.sh | ||
| lint-shebang.sh | ||
| lint-shell-locale.sh | ||
| lint-shell.sh | ||
| lint-whitespace.sh | ||
README.md
This folder contains lint scripts.
commit-script-check.sh
Verification of scripted diffs.
git-subtree-check.sh
Run this script from the root of the repository to verify that a subtree matches the contents of the commit it claims to have been updated to.
To use, make sure that you have fetched the upstream repository branch in which the subtree is maintained:
- for
src/secp256k1: https://github.com/bitcoin-core/secp256k1.git (branch master) - for
src/leveldb: https://github.com/bitcoin-core/leveldb.git (branch bitcoin-fork) - for
src/univalue: https://github.com/bitcoin-core/univalue.git (branch master) - for
src/crypto/ctaes: https://github.com/bitcoin-core/ctaes.git (branch master)
Usage: git-subtree-check.sh DIR (COMMIT)
COMMIT may be omitted, in which case HEAD is used.
lint-all.sh
Calls other scripts with the lint- prefix.