fixed documentation on disabling/enabling hardening flags #3367

pull haltingstate wants to merge 2 commits into bitcoin:master from haltingstate:master changing 2 files +5 −3

haltingstate commented at 8:45 AM on December 8, 2013: contributor

No description provided.
haltingstate commented at 12:33 AM on December 9, 2013: contributor

Should be good now. thanks!
haltingstate closed this on Dec 9, 2013
haltingstate reopened this on Dec 9, 2013
gavinandresen commented at 5:11 AM on December 9, 2013: contributor

Please squash the three commits into one.

Restore hex to getrawtransaction vout scriptPubkey.

Commit be066fad accidentally removed the hex field.
This gets in the way of doing offline signing.

(credit belongs to sipa for actually looking for the
 cause instead of being lazy like me and just shrugging
 and writing the scriptpubkey from the asm.)

998ae65c92

fixed documentation
fixed ident fixed ident
f5fa0cfb3d
haltingstate commented at 5:41 AM on December 9, 2013: contributor

Ok, squashed.
BitcoinPullTester commented at 5:53 AM on December 9, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/f5fa0cfb3dfef94c8b2b80df81a41bac9922be2e for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
fanquake commented at 8:27 AM on December 9, 2013: member

@haltingstate Looks like you've pulled in an unrelated commit.
jgarzik commented at 12:01 AM on December 13, 2013: contributor

ACK commit -- though @fanquake correctly notes another problem
laanwj commented at 4:51 AM on December 13, 2013: member

Yes, let's get rid of that extra commit then we can merge this.
haltingstate commented at 10:57 AM on December 13, 2013: contributor

I dont know the github command to fix it. What would I run.

On Thu, Dec 12, 2013 at 8:51 PM, Wladimir J. van der Laan < notifications@github.com> wrote:

Yes, let's get rid of that extra commit then we can merge this.

— Reply to this email directly or view it on GitHubhttps://github.com/bitcoin/bitcoin/pull/3367#issuecomment-30487009 .
laanwj commented at 11:25 AM on December 13, 2013: member
```
git rebase -i <starting commit>
```
In this case,
```
git rebase -i 998ae65c9274df1d595e41db3885631d93eca4b0
```
Then delete the line with the extra commit, save and exit. Then do a force push to your repository, i.e.
```
git push -f origin master
```
haltingstate commented at 11:29 AM on December 13, 2013: contributor

The repo appears to be corrupted. It has been five days and I am getting this error from github

https://github.com/haltingstate/bitcoin

On Fri, Dec 13, 2013 at 3:26 AM, Wladimir J. van der Laan < notifications@github.com> wrote:

git rebase -i <starting commit>

In this case,

git rebase -i 998ae65c9274df1d595e41db3885631d93eca4b0

Then delete the line with the extra commit, save and exit. Then do a force push to your repository, i.e.

git push -f origin master

— Reply to this email directly or view it on GitHubhttps://github.com/bitcoin/bitcoin/pull/3367#issuecomment-30502952 .
laanwj commented at 11:39 AM on December 13, 2013: member

Seems to work again for me now...
haltingstate commented at 11:46 AM on December 13, 2013: contributor

I had to delete local repo, repull and then change the file. You can close this pull request and the new pull request is at

#3411

On Fri, Dec 13, 2013 at 3:40 AM, Wladimir J. van der Laan < notifications@github.com> wrote:

Seems to work again for me now...

— Reply to this email directly or view it on GitHubhttps://github.com/bitcoin/bitcoin/pull/3367#issuecomment-30503576 .
haltingstate closed this on Dec 13, 2013
Bushstar referenced this in commit 94bcf85347 on Apr 8, 2020
DrahtBot locked this on Sep 8, 2021

Contributors

Linked (view graph)

#3411 fixed documentation on disabling/enabling hardening flags