Incremental improvement to readability.
Doc: Update isStandardTx comment #7786
pull smatthewenglish wants to merge 1 commits into bitcoin:master from smatthewenglish:patch-2 changing 1 files +2 −2-
smatthewenglish commented at 9:44 PM on April 1, 2016: contributor
-
pstratem commented at 10:42 PM on April 1, 2016: contributor
utACK 8d3a32fcd3fe4747c64bd09e344c0a22751784d8
-
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?
laanwj added the label Docs and Output on Apr 2, 2016paveljanik 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?
smatthewenglish commented at 8:13 AM on April 6, 2016: contributordone.
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)
MarcoFalke commented at 4:50 PM on April 7, 2016: memberPlease squash and make the commit message something like
[doc] Improve IsStandardTx commentsmatthewenglish commented at 4:58 PM on April 7, 2016: contributorI'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.
paveljanik commented at 5:40 PM on April 7, 2016: contributorSee e.g. #1952 where
git rebase -iis described. Or you are doing it via web (patch-2)?paveljanik commented at 5:41 PM on April 7, 2016: contributorBut squashing these two commits into one can be done when merging, but better do this yourself.
smatthewenglish commented at 6:03 PM on April 7, 2016: contributorcool- 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)
smatthewenglish commented at 7:28 PM on April 8, 2016: contributorso 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.
paveljanik commented at 7:33 PM on April 8, 2016: contributorLooks like you need to
git pushyet :-)smatthewenglish commented at 7:35 PM on April 8, 2016: contributorso 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)
paveljanik commented at 7:37 PM on April 8, 2016: contributorI think
git push -f origin patch-2smatthewenglish commented at 7:39 PM on April 8, 2016: contributorhe 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)
paveljanik commented at 7:42 PM on April 8, 2016: contributorHmm, your current work is in
patch-2, so it looks like to do not have a proper clone of it locally. What doesgit remote show originshow for you? Can you join IRC?smatthewenglish commented at 7:46 PM on April 8, 2016: contributor
paveljanik commented at 7:49 PM on April 8, 2016: contributorAh, 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-2smatthewenglish commented at 7:57 PM on April 8, 2016: contributorah, rats! seems-
no dice!smatthewenglish commented at 8:09 PM on April 8, 2016: contributorhttp://stackoverflow.com/questions/5802426/git-error-src-refspec-master-does-not-match-any
^ I tried that :/ anyway- I'll keep werking on it
paveljanik commented at 8:10 PM on April 8, 2016: contributorSo 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-2OK?
smatthewenglish commented at 8:19 PM on April 8, 2016: contributorHmm- 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 e9723cb27384ccd8e4bd78d2fea907534fd0d94abut 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!
smatthewenglish commented at 8:19 PM on April 8, 2016: contributorHow to join IRC?
paveljanik commented at 8:34 PM on April 8, 2016: contributorJoin IRC here: https://bitcoincore.org/en/contribute/ - there is a webchat link to join irc.freenode.net.
smatthewenglish commented at 8:46 PM on April 8, 2016: contributorfor 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)
smatthewenglish commented at 8:46 PM on April 8, 2016: contributormaybe 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)
paveljanik commented at 8:48 PM on April 8, 2016: contributorClick on #bitcoin-core-dev.
smatthewenglish commented at 8:57 PM on April 8, 2016: contributorok cool- I'm there as 'matthew_english'
smatthewenglish commented at 9:08 PM on April 8, 2016: contributor
smatthewenglish force-pushed on Apr 8, 2016Doc: Update isStandardTx comment 03c77fdc14smatthewenglish force-pushed on Apr 8, 2016paveljanik commented at 9:23 PM on April 8, 2016: contributorlaanwj commented at 10:12 AM on April 9, 2016: member@s-matthew-english Thanks for going through this @paveljanik Thanks for helping him go through this
ACK https://github.com/bitcoin/bitcoin/pull/7786/commits/03c77fdc143fb8d533011f23164daac560e381b2
laanwj renamed this:Update policy.cpp
Doc: Update isStandardTx comment
on Apr 9, 2016laanwj merged this on Apr 9, 2016laanwj closed this on Apr 9, 2016laanwj referenced this in commit 065c6b443f on Apr 9, 2016codablock referenced this in commit 1d19451ca5 on Sep 16, 2017codablock referenced this in commit d3f689d19e on Sep 19, 2017codablock referenced this in commit 2a7971010d on Dec 20, 2017MarcoFalke locked this on Sep 8, 2021Labels
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
More mirrored repositories can be found on mirror.b10c.me