Skip to content

Commit 1b13bfb

Browse files
committed
Merge #1132: contrib: remove github-merge.py
df7b542 contrib: remove github-merge.py (fanquake) Pull request description: This script is a much older copy of the script in https://github.com/bitcoin-core/bitcoin-maintainer-tools. ACKs for top commit: achow101: ACK df7b542 glozow: ACK df7b542 Tree-SHA512: b911fc5a2e852bb9cd3974cef2e198350307d5b1bbb6d641a5b72e792b90b877fb9483a884207c3fde7651be761efda4982f3eed28d35a4bd8e8dcec85c1a1c3
2 parents 70fccba + df7b542 commit 1b13bfb

File tree

3 files changed

+0
-286
lines changed

3 files changed

+0
-286
lines changed

contrib/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Repository Tools
33

44
### [Developer tools](/contrib/devtools) ###
55
Specific tools for developers working on this repository.
6-
Contains the script `github-merge.py` for merging github pull requests securely and signing them using GPG.
76

87
### [Verify-Commits](/contrib/verify-commits) ###
98
Tool to verify that every merge commit was signed by a developer using the above `github-merge.py` script.

contrib/devtools/README.md

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,6 @@ Contents
22
========
33
This directory contains tools for developers working on this repository.
44

5-
github-merge.py
6-
===============
7-
8-
A small script to automate merging pull-requests securely and sign them with GPG.
9-
10-
For example:
11-
12-
./github-merge.py 3077
13-
14-
(in any git repository) will help you merge pull request #3077 for the
15-
bitcoin-core/bitcoincore.org repository.
16-
17-
What it does:
18-
* Fetch master and the pull request.
19-
* Locally construct a merge commit.
20-
* Show the diff that merge results in.
21-
* Ask you to verify the resulting source tree (so you can do a make
22-
check or whatever).
23-
* Ask you whether to GPG sign the merge commit.
24-
* Ask you whether to push the result upstream.
25-
26-
This means that there are no potential race conditions (where a
27-
pullreq gets updated while you're reviewing it, but before you click
28-
merge), and when using GPG signatures, that even a compromised github
29-
couldn't mess with the sources.
30-
31-
Setup
32-
---------
33-
Configuring the github-merge tool for the bitcoin repository is done in the following way:
34-
35-
git config githubmerge.repository bitcoin-core/bitcoincore.org
36-
git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing)
37-
git config --global user.signingkey mykeyid (if you want to GPG sign)
38-
395
people-present.sh
406
=================
417

contrib/devtools/github-merge.py

Lines changed: 0 additions & 251 deletions
This file was deleted.

0 commit comments

Comments
 (0)