Changeset View
Changeset View
Standalone View
Standalone View
contrib/devtools/README.md
| Show First 20 Lines • Show All 96 Lines • ▼ Show 20 Lines | |||||
| * for `src/leveldb`: https://github.com/bitcoin-core/leveldb.git (branch bitcoin-fork) | * 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/univalue`: https://github.com/bitcoin-core/univalue.git (branch master) | ||||
| * for `src/crypto/ctaes`: https://github.com/bitcoin-core/ctaes.git (branch master) | * for `src/crypto/ctaes`: https://github.com/bitcoin-core/ctaes.git (branch master) | ||||
| Usage: `git-subtree-check.sh DIR (COMMIT)` | Usage: `git-subtree-check.sh DIR (COMMIT)` | ||||
| `COMMIT` may be omitted, in which case `HEAD` is used. | `COMMIT` may be omitted, in which case `HEAD` is used. | ||||
| github-merge.py | |||||
| =============== | |||||
| A small script to automate merging pull-requests securely and sign them with GPG. | |||||
| For example: | |||||
| ./github-merge.py 3077 | |||||
| (in any git repository) will help you merge pull request #3077 for the | |||||
| bitcoin/bitcoin repository. | |||||
| What it does: | |||||
| * Fetch master and the pull request. | |||||
| * Locally construct a merge commit. | |||||
| * Show the diff that merge results in. | |||||
| * Ask you to verify the resulting source tree (so you can do a make | |||||
| check or whatever). | |||||
| * Ask you whether to GPG sign the merge commit. | |||||
| * Ask you whether to push the result upstream. | |||||
| This means that there are no potential race conditions (where a | |||||
| pullreq gets updated while you're reviewing it, but before you click | |||||
| merge), and when using GPG signatures, that even a compromised GitHub | |||||
| couldn't mess with the sources. | |||||
| Setup | |||||
| --------- | |||||
| Configuring the github-merge tool for the bitcoin repository is done in the following way: | |||||
| git config githubmerge.repository bitcoin/bitcoin | |||||
| git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing) | |||||
| git config --global user.signingkey mykeyid (if you want to GPG sign) | |||||
| optimize-pngs.py | optimize-pngs.py | ||||
| ================ | ================ | ||||
| A script to optimize png files in the bitcoin | A script to optimize png files in the bitcoin | ||||
| repository (requires pngcrush). | repository (requires pngcrush). | ||||
| security-check.py and test-security-check.py | security-check.py and test-security-check.py | ||||
| ============================================ | ============================================ | ||||
| Show All 34 Lines | |||||