0.18 backport: backport github-merge.py improvements #16351

pull fanquake wants to merge 5 commits into bitcoin:0.18 from fanquake:backport_github_merge_improvements changing 1 files +96 −22

fanquake commented at 4:45 AM on July 7, 2019: member

Recent improvements to the github-merge.py script in master, such as including review comments and displaying ACKs at sign-off time would be nice to have in the 0.18 branch. It also keeps the merge process the same for both branches.

contrib: gh-merge: Include review comments in merge commit

Github-Pull: #15643
Rebased-From: fa1c073154c6a39dca878f5c9a37abee8af0fd30

93394898a4

contrib: gh-merge: Use pagination to fetch all review comments

Github-Pull: #15838
Rebased-From: 942ff2054b41fe3f78f1b3d88cfd032bc95fd62f

5ff91d2bfd

Don't GPG sign intermediate commits with github-merge tool

Github-Pull: #16130
Rebased-From: a352d2ae5f5e8a0204d49d66ff458a1505609de3

d1a09cfdb2

devtools: Always use unabbreviated commit IDs in github-merge.py

Always put the unabbreviated commit IDs in the generated commit messages
and other places. This prevents the developer's `core.abbrev` git setting
from leaking through and is better against ambiguity too.

Github-Pull: #16201
Rebased-From: 067fba56314f399674dd471c663e663040be52a3

ed218a21a1

devtools: Fetch and display ACKs at sign-off time in github-merge

- Fetch the ACKs only at sign-off time. This makes sure that any
  last-minute ACKs are included (fixes #16200)
- Show a list of ACKs and their author before signing off, and warn if
  there are none

Github-Pull: #16223
Rebased-From: 0e01e4522e0f9e2e994f80fc61f40d61a4a70d79

b58763ba01

fanquake added the label Backport on Jul 7, 2019
fanquake requested review from laanwj on Jul 7, 2019
laanwj commented at 1:13 PM on July 8, 2019: member

We haven't historically done this, generally I use the tools and process of master no matter what is on the specific branch. But if it helps you, I don't mind. (it does raise the question, how far back do you want to go?)
MarcoFalke commented at 1:22 PM on July 8, 2019: member

github-merge should be part of a separate repository, since it is not tied to the release process. I think we keep it here to expose it to more review.

Also, you might want to consider using an out-of-tree github-merge script, as you might have accidentally checked out a branch or pull request that shipped you a modified (potentially malicious) github-merge script.
MarcoFalke commented at 1:23 PM on July 8, 2019: member

So tend to NACK, it should either be left untouched or removed
fanquake commented at 1:30 PM on July 8, 2019: member

I'll just move to using an out-of-tree script.
fanquake closed this on Jul 8, 2019
fanquake deleted the branch on Jul 8, 2019
fanquake removed review request from laanwj on Jul 8, 2019
MarcoFalke locked this on Dec 16, 2021

Contributors

Labels