Doc: Update isStandardTx comment #7786

pull smatthewenglish wants to merge 1 commits into bitcoin:master from smatthewenglish:patch-2 changing 1 files +2 −2
  1. smatthewenglish commented at 9:44 PM on April 1, 2016: contributor

    Incremental improvement to readability.

  2. pstratem commented at 10:42 PM on April 1, 2016: contributor

    utACK 8d3a32fcd3fe4747c64bd09e344c0a22751784d8

  3. laanwj commented at 5:13 AM on April 2, 2016: member

    This could use a more descriptive commit message. (see #7785 for an example on how to do this)

  4. in src/policy/policy.cpp:None in 8d3a32fcd3 outdated
      77 | @@ -78,7 +78,7 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason)
      78 |          // bytes of scriptSig, which we round off to 1650 bytes for some minor
      79 |          // future-proofing. That's also enough to spend a 20-of-20
      80 |          // CHECKMULTISIG scriptPubKey, though such a scriptPubKey is not
      81 | -        // considered standard)
    


    paveljanik commented at 5:41 AM on April 2, 2016:

    When touching this comment, can you please also move the '(520 byte limit)' above before the dot?

  5. laanwj added the label Docs and Output on Apr 2, 2016
  6. paveljanik commented at 8:07 AM on April 6, 2016: contributor

    @s-matthew-english Can you please fix these nits, so we an proceed with this PR?

  7. smatthewenglish commented at 8:13 AM on April 6, 2016: contributor

    done.

    On Wed, Apr 6, 2016 at 10:08 AM, paveljanik notifications@github.com wrote:

    @s-matthew-english https://github.com/s-matthew-english Can you please fix these nits, so we an proceed with this PR?

    — You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub #7786 (comment)

  8. MarcoFalke commented at 4:50 PM on April 7, 2016: member

    Please squash and make the commit message something like [doc] Improve IsStandardTx comment

  9. smatthewenglish commented at 4:58 PM on April 7, 2016: contributor

    I'm new to contributing to projects on here, but I'm trying to learn, that's why I did this, so I'm wondering, what does it mean to squash the commit? How to do that?

    *Please forgive me if this question is daft.

  10. paveljanik commented at 5:40 PM on April 7, 2016: contributor

    See e.g. #1952 where git rebase -i is described. Or you are doing it via web (patch-2)?

  11. paveljanik commented at 5:41 PM on April 7, 2016: contributor

    But squashing these two commits into one can be done when merging, but better do this yourself.

  12. smatthewenglish commented at 6:03 PM on April 7, 2016: contributor

    cool- I'll do this tonight

    On Thu, Apr 7, 2016 at 7:42 PM, paveljanik notifications@github.com wrote:

    But squashing these two commits into one can be done when merging, but better do this yourself.

    — You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub #7786 (comment)

  13. smatthewenglish commented at 7:28 PM on April 8, 2016: contributor

    so I tried to do it from my terminal- since originally I made these changes just online using GitHub web app- but- did the changes percolate? I used the suggested name of the commit message and all :/

    Please forgive me if this is a bit daft- but- Im just learning how to become a contributor to an open source project.

  14. paveljanik commented at 7:33 PM on April 8, 2016: contributor

    Looks like you need to git push yet :-)

  15. smatthewenglish commented at 7:35 PM on April 8, 2016: contributor

    so then just 'git push -u origin master'?

    On Fri, Apr 8, 2016 at 9:33 PM, paveljanik notifications@github.com wrote:

    Looks like you need to git push yet :-)

    — You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub #7786 (comment)

  16. paveljanik commented at 7:37 PM on April 8, 2016: contributor

    I think git push -f origin patch-2

  17. smatthewenglish commented at 7:39 PM on April 8, 2016: contributor

    he tell me this:

    "error: src refspec patch-2 does not match any."

    On Fri, Apr 8, 2016 at 9:38 PM, paveljanik notifications@github.com wrote:

    I think git push -f origin patch-2

    — You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub #7786 (comment)

  18. paveljanik commented at 7:42 PM on April 8, 2016: contributor

    Hmm, your current work is in patch-2, so it looks like to do not have a proper clone of it locally. What does git remote show origin show for you? Can you join IRC?

  19. smatthewenglish commented at 7:46 PM on April 8, 2016: contributor

    btc

  20. paveljanik commented at 7:49 PM on April 8, 2016: contributor

    Ah, so you cloned the original source, not your patch-2 branch. OK. This should work then:

    git remote add s-matthew-english https://www.github.com/s-matthew-english/bitcoin
    git push -f s-matthew-english patch-2
    
  21. smatthewenglish commented at 7:57 PM on April 8, 2016: contributor

    ah, rats! seems- btddc no dice!

  22. smatthewenglish commented at 8:09 PM on April 8, 2016: contributor
  23. paveljanik commented at 8:10 PM on April 8, 2016: contributor

    So please start from scratch in empty directory:

    git clone https://www.github.com/s-matthew-english/bitcoin
    cd bitcoin
    git checkout --track origin/patch-2
    git rebase -i e9723cb27384ccd8e4bd78d2fea907534fd0d94a
    ... change pick to squash on the second line
    ... change the commit message
    git push -f origin patch-2
    

    OK?

  24. smatthewenglish commented at 8:19 PM on April 8, 2016: contributor

    Hmm- I don't know if it worked.

    I'm not so good at VIM

    I tried to change the commit message after the step git rebase -i e9723cb27384ccd8e4bd78d2fea907534fd0d94a

    but I don't know if these ones percolated: ... change pick to squash on the second line ... change the commit message

    and then finally it just told me:

    "Everything up-to-date"

    So- that doesn't seem right :/

    I'm sorry to be so daft believe me!

  25. smatthewenglish commented at 8:19 PM on April 8, 2016: contributor

    How to join IRC?

  26. paveljanik commented at 8:34 PM on April 8, 2016: contributor

    Join IRC here: https://bitcoincore.org/en/contribute/ - there is a webchat link to join irc.freenode.net.

  27. smatthewenglish commented at 8:46 PM on April 8, 2016: contributor

    for some reason the link http://irc.freenode.net/ seems not to load on Chromium or Firefox

    On Fri, Apr 8, 2016 at 10:35 PM, paveljanik notifications@github.com wrote:

    Join IRC here: https://bitcoincore.org/en/contribute/ - there is a webchat link to join irc.freenode.net.

    — You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub #7786 (comment)

  28. smatthewenglish commented at 8:46 PM on April 8, 2016: contributor

    maybe my Uni blocks it?

    On Fri, Apr 8, 2016 at 10:45 PM, Matthew English < s.matthew.english@gmail.com> wrote:

    for some reason the link http://irc.freenode.net/ seems not to load on Chromium or Firefox

    On Fri, Apr 8, 2016 at 10:35 PM, paveljanik notifications@github.com wrote:

    Join IRC here: https://bitcoincore.org/en/contribute/ - there is a webchat link to join irc.freenode.net.

    — You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub #7786 (comment)

  29. paveljanik commented at 8:48 PM on April 8, 2016: contributor

    Click on #bitcoin-core-dev.

  30. smatthewenglish commented at 8:57 PM on April 8, 2016: contributor

    ok cool- I'm there as 'matthew_english'

  31. smatthewenglish commented at 9:08 PM on April 8, 2016: contributor

    btc

  32. smatthewenglish force-pushed on Apr 8, 2016
  33. Doc: Update isStandardTx comment 03c77fdc14
  34. smatthewenglish force-pushed on Apr 8, 2016
  35. laanwj commented at 10:12 AM on April 9, 2016: member
  36. laanwj renamed this:
    Update policy.cpp
    Doc: Update isStandardTx comment
    on Apr 9, 2016
  37. laanwj merged this on Apr 9, 2016
  38. laanwj closed this on Apr 9, 2016

  39. laanwj referenced this in commit 065c6b443f on Apr 9, 2016
  40. codablock referenced this in commit 1d19451ca5 on Sep 16, 2017
  41. codablock referenced this in commit d3f689d19e on Sep 19, 2017
  42. codablock referenced this in commit 2a7971010d on Dec 20, 2017
  43. MarcoFalke 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: 2026-04-21 21:15 UTC

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