Add PR description to merge commit in github-merge.py #10786

pull sipa wants to merge 1 commits into bitcoin:master from sipa:20170710_prbody changing 1 files +2 −0
  1. sipa commented at 7:49 pm on July 10, 2017: member

    There is often some context given in PR descriptions that is missing from commits, and it may be worthwhile to retain that information in our history in git. This PR adds that information to the merge commit when created through github-merge.py.

    We should also encourage people to provide as much information as possible in the PR commits themselves, but I believe that is an orthogonal issue. Individual commits don’t need to have a description of the overall goal of a PR.

  2. MarcoFalke commented at 8:03 pm on July 10, 2017: member

    ACK

    On Mon, Jul 10, 2017 at 9:49 PM, Pieter Wuille notifications@github.com wrote:

    There is often some context given in PR descriptions that is missing from commits, and it may be worthwhile to retain that information in our history in git. This PR adds that information to the merge commit when created through github-merge.py.

    We should also encourage people to provide as much information as possible in the PR commits themselves, but I believe that is an orthogonal issue. Individual commits don’t need to have a description of the overall goal of a PR.

    You can view, comment on, or merge this pull request online at:

    #10786 Commit Summary

    • Add PR description to merge commit in github-merge.py

    File Changes

    Patch Links:

    — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/bitcoin/bitcoin/pull/10786, or mute the thread https://github.com/notifications/unsubscribe-auth/AGGmv2dCxNyQQJAXY55qxT8K8F0DFQXRks5sMoBSgaJpZM4OTU0D .

  3. Add PR description to merge commit in github-merge.py 475c08cb44
  4. in contrib/devtools/github-merge.py:178 in de4d3c5c84 outdated
    174@@ -175,6 +175,7 @@ def main():
    175     if info is None:
    176         exit(1)
    177     title = info['title'].strip()
    178+    body = '  ' + info['body'].replace('\n', '\n  ')
    


    promag commented at 8:11 pm on July 10, 2017:
    I think here should be body = info['body'].strip() like the above. And the body indentation should be below.

    sipa commented at 8:21 pm on July 10, 2017:
    Agree, fixed.
  5. sipa force-pushed on Jul 10, 2017
  6. promag commented at 8:34 pm on July 10, 2017: member

    ACK 475c08c.

    For the record, after this, the PR description must be part of the review process. Don’t forget that there can be typos, markdown, links for temporary resources, etc that will be written in stone. Maybe for future improvement is to print the body and prompt for confirmation.

  7. jonasschnelli commented at 8:17 am on July 11, 2017: contributor
    Great idea. Tested ACK 475c08cb446371dd75fb37e067613effc0572442 (https://github.com/libbtc/libbtc/commit/7c6168c4c83403be1f64ff6a8baa94619fb57ee0)
  8. jonasschnelli added the label Scripts and tools on Jul 11, 2017
  9. laanwj commented at 9:37 am on July 11, 2017: member
    Concept ACK
  10. laanwj merged this on Jul 11, 2017
  11. laanwj closed this on Jul 11, 2017

  12. laanwj referenced this in commit ca4c545cc7 on Jul 11, 2017
  13. jonasschnelli commented at 1:44 pm on July 11, 2017: contributor
    I guess we are fine with HTML code in the PR description (=> goes then into git commit message)? PRs like #10769 may include images (via HTML <img>code).
  14. PastaPastaPasta referenced this in commit 331e0a69e1 on Jul 6, 2019
  15. PastaPastaPasta referenced this in commit 3ec5db8e42 on Jul 6, 2019
  16. PastaPastaPasta referenced this in commit 1c40eb65f8 on Jul 8, 2019
  17. PastaPastaPasta referenced this in commit 5daca7905f on Jul 9, 2019
  18. PastaPastaPasta referenced this in commit f961471015 on Jul 11, 2019
  19. PastaPastaPasta referenced this in commit 56d24deb02 on Jul 13, 2019
  20. PastaPastaPasta referenced this in commit 0969f1f9b9 on Jul 17, 2019
  21. PastaPastaPasta referenced this in commit 6d2e0438a2 on Jul 17, 2019
  22. PastaPastaPasta referenced this in commit ec01825ba5 on Jul 18, 2019
  23. barrystyle referenced this in commit 57607c7572 on Jan 22, 2020
  24. DrahtBot locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-10-04 19:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me