You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

README.md 1.2KB

12345678910111213141516171819202122232425262728293031323334353637
  1. Contents
  2. ========
  3. This directory contains tools for developers working on this repository.
  4. github-merge.py
  5. ===============
  6. A small script to automate merging pull-requests securely and sign them with GPG.
  7. For example:
  8. ./github-merge.py 3077
  9. (in any git repository) will help you merge pull request #3077 for the
  10. devrandom/gitian-builder repository.
  11. What it does:
  12. * Fetch master and the pull request.
  13. * Locally construct a merge commit.
  14. * Show the diff that merge results in.
  15. * Ask you to verify the resulting source tree (so you can do a make
  16. check or whatever).
  17. * Ask you whether to GPG sign the merge commit.
  18. * Ask you whether to push the result upstream.
  19. This means that there are no potential race conditions (where a
  20. pullreq gets updated while you're reviewing it, but before you click
  21. merge), and when using GPG signatures, that even a compromised github
  22. couldn't mess with the sources.
  23. Setup
  24. ---------
  25. Configuring the github-merge tool for this repository is done in the following way:
  26. git config githubmerge.repository devrandom/gitian-builder
  27. git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing)
  28. git config --global user.signingkey mykeyid (if you want to GPG sign)