Looks like @maclover7 had some trouble landing something and commits back to 64ed366e6fc62af434b28c8b3ebd815e6ba51c69 are not correct atm.
I was in irc with him helping him resolve the land but had to step away and I'm not sure what happened. He doesn't seem to be around anymore.
I have a correct copy up to the commits I landed today (what would supposedly be HEAD atm) I'm going to force push in a few minutes if I don't get a response back from @maclover7 or someone objects.
Fishrock123
All 7 comments
@Fishrock123 Please just force push immediately whatever your latest snapshot is. This looks badly broken. I don't think we want someone continuing to land on top of this already broken state.
apapirovski
on 26 Jan 2018
Fwiw the commits in question are https://github.com/nodejs/node/compare/2cb9e2a6f7c570fe317d560de840046595c3f2ec...993b7164933addab4021efe52d1e736976685d7c
Fishrock123
on 26 Jan 2018
I just force pushed master. Current head is now 082f9525d92532867bc7172acebdf9b89a715dab.
cjihrig
on 26 Jan 2018
I re-added the remaining commits. Current head is now https://github.com/nodejs/node/commits/bb5575aa75fd3071724d5eccde39a3041e1af57a
We are OK now so I'm going to close this.
@maclover7 please reach out if you need assistance. :)
Fishrock123
on 26 Jan 2018
Thank you for sorting it out.
jasnell
on 27 Jan 2018
I apologize -- this originally started when I was trying to land 18263, and the patch was not applying properly. I decided I would try and merge the PR, and then amend the commit to add the metadata. @Fishrock123 merged his timers PRs at the same time, so there was a conflict. I then amended 18263's commit and added the metadata, and pushed to upstream, but it looks like that made me the committer on all commits from 18263's commit to HEAD.
It turns out, in hindsight, that the change from 18263 had already been applied via 17407 (if you look the same exact commit is there), so 18263 became irrelevant when 17407 was merged. I am sorry for all of the hassle.
maclover7
on 27 Jan 2018
@maclover7 Just curious, is this what happened?
Fishrock123> git am the timer PR
Fishrock123> git push to master
maclover7> git fetch 18263 to a local branch
maclover7> git checkout master
maclover7> git fetch master and update it to where Fishrock123 has pushed
maclover7> git merge 18263
maclover7> ??? something happened that resulted in 2cb9e2a...993b716
maclover7> git commit --amend the message
maclover7> git push to master # where is started to be broken with extra commits
cjihrig > git push --force # to 082f952
Fishrock123> git cherry-pick 082f952...bb5575a
Fishrock123> git push to master # back to normal
I wonder wether a pre-push git hook could help with this...see https://github.com/nodejs/node-core-utils/issues/160 but I am not sure how to reproduce those extra commits.
joyeecheung
on 27 Jan 2018
Related issues
Brekmister
路
3Comments
fanjunzhi
路
3Comments
danialkhansari
路
3Comments
Icemic
路
3Comments
stevenvachon
路
3Comments
Most helpful comment
I apologize -- this originally started when I was trying to land 18263, and the patch was not applying properly. I decided I would try and merge the PR, and then amend the commit to add the metadata. @Fishrock123 merged his timers PRs at the same time, so there was a conflict. I then amended 18263's commit and added the metadata, and pushed to upstream, but it looks like that made me the committer on all commits from 18263's commit to HEAD.
It turns out, in hindsight, that the change from 18263 had already been applied via 17407 (if you look the same exact commit is there), so 18263 became irrelevant when 17407 was merged. I am sorry for all of the hassle.