< jtimon>
I guess if I rebase now there will be more instances, but then I would lose the 2 ACKs.
< jtimon>
What should I do?
< jtimon>
how many acks do I need to get something merged anyway?
< elichai2>
promag: hi, did you mean I should replace it with `ParseHex(const std::string&)` even though it will add a std::string allocations where we have raw strings (about 15% penalty in time in 32 byte hex on my machine)
< elichai2>
I'll probably leave only the hex change.
< Talkless>
whatever, just deleted branch and did that "trick" again.. ugh git is so daunting.. :/
< gwillen>
Talkless: after you did that command, what did you do? There are a few ways to proceed from there, and the answer depends on which one you did.
< gwillen>
It sounds like you checked it out into a local branch, in which case deleting the local branch and doing it again (as you did) is probably the easiest thing to do.
< Talkless>
pulling produced merge errors, resetting just gone back to the original old version
< Talkless>
yes :BRANCHNAME does that, doing second time is not allowed by git
< Talkless>
then checkout BRANCHNAME I believe
< gwillen>
aha yeah, I see the instructions
< gwillen>
so, when you "checkout branchname" what it's doing is creating a new _local_ branch that is a copy of the _remote_ branch, and then it gets mad when the remote branch is force-pushed vs the local copy
< Talkless>
gwillen: what would be your suggestion? I guess it's simpler to just go to authors git pate, clone it's repo and checkout that branch he's working on...
< gwillen>
the way I prefer to do this is not to create a local branch at all -- instead I will directly "git checkout origin/pull/ID"
< gwillen>
this does not create a local branch, and after a fetch you can just do it again to check out the new version
< Talkless>
gwillen: wow, didn't new that trick, thanks
< Talkless>
cool
< gwillen>
np! git will warn you about "detached head", this warning just means you are on no local branch
< gwillen>
which means you cannot commit any changes
< gwillen>
but for reviewing this is fine
< Talkless>
no I don't need commiting, just for review
< gwillen>
exactly
< gwillen>
(it's possible that I spelled the name of the remote branch wrong in the checkout -- you can "git branch -av" to see a list of all branches including remote ones, this will tell you the exact correct name of the remote branch)
< Talkless>
this could be added to that tutorial on help.github.com :)
< gwillen>
well, I have no power over help.github.com, but perhaps we could add it to one of the docs in the bitcoin core repo, if it's not there already
< gwillen>
(if you haven't read all the stuff under https://github.com/bitcoin/bitcoin/tree/master/doc , do take a look, especially check out productivity.md, which is where I would add this with the other git tips)
< bitcoin-git>
bitcoin/master 1abcecc Jorge Timon: Tests: Use self.chain instead of 'regtest' in almost all current tests
< bitcoin-git>
bitcoin/master f32564f MarcoFalke: Merge #16681: Tests: Use self.chain instead of 'regtest' in all current te...
< bitcoin-git>
[bitcoin] MarcoFalke merged pull request #16681: Tests: Use self.chain instead of 'regtest' in all current tests (master...b19-testchains-tests) https://github.com/bitcoin/bitcoin/pull/16681