Locria Cyber (Nov 01 2021 at 10:03): Locria Cyber (Nov 01 2021 at 10:03):Ok I just ran git --mirror when I meant to just update one branch
Locria Cyber (Nov 01 2021 at 10:04):how do I undo that
Folkert de Vries (Nov 01 2021 at 10:05):this somehow closed a bunch of open pull requests
Folkert de Vries (Nov 01 2021 at 10:09):what did you run exactly? from what I'm seeing mirror would just clone in a special way, but not modify the original
Folkert de Vries (Nov 01 2021 at 10:09):though maybe it does
Folkert de Vries (Nov 01 2021 at 10:10):also, why mirror the repo?
Locria Cyber (Nov 01 2021 at 10:11):just git push --mirror
Locria Cyber (Nov 01 2021 at 10:12):git push --mirror
git status
git add .
git checkout . --ours
git rebase --continue
git rebase -i refactor/backend-options
git checkout refactor/no-panic
nix-shell
I tried to force-update current branch but used the wrong command
Locria Cyber (Nov 01 2021 at 10:13):I think it reverted the history to the last time I pulled the repository
Locria Cyber (Nov 01 2021 at 10:25):I'm really sorry!
Locria Cyber (Nov 01 2021 at 10:26):I think I recovered all the commits and tags, but lost all the branch names and tag names.
Folkert de Vries (Nov 01 2021 at 10:28):github also seems to just still have commits and stuff
Folkert de Vries (Nov 01 2021 at 10:28):only thing is that authors need to re-open PRs that were automatically closed
Folkert de Vries (Nov 01 2021 at 10:28):so, nothing seems lost unless I'm missing something
Brian Hicks (Nov 01 2021 at 10:33):ohhh, so I guess that command closed PRs because it deleted the branches on the remote, and since we all use the same remote so CI works… tada! OK, mystery solved.
I'll go through and undelete/reopen a bunch of these to get us closer to normal.
Locria Cyber (Nov 01 2021 at 10:35):You can use git push --all to update remote branches that I deleted or reverted.
Folkert de Vries (Nov 01 2021 at 10:36):I can restore branches but not re-open PRs that are not my own
Folkert de Vries (Nov 01 2021 at 10:37):@Locria Cyber so far github itself seems to have all the data still, so I'd prefer using that over pushing "global" git commands
Locria Cyber (Nov 01 2021 at 10:37):Folkert de Vries said:
Locria Cyber so far github itself seems to have all the data still, so I'd prefer using that over pushing "global" git commands
git push --all update all the branch names
Brian Hicks (Nov 01 2021 at 10:38):I'm boopin' the buttons now. Found out there's a query for when something closed. Looks like only 20 PRs or so? Easy.
Locria Cyber (Nov 01 2021 at 10:38):I basically deleted all the remote branches that are not in my local repository.
Folkert de Vries (Nov 01 2021 at 10:38):right so I think you don't need to do anything @Locria Cyber
Folkert de Vries (Nov 01 2021 at 10:39):we can restore from github
Locria Cyber (Nov 01 2021 at 10:39):Doesn't Github have all the branch names?
Folkert de Vries (Nov 01 2021 at 10:40):not sure what you mean. All PRs are reopened now and they seem to have their original branch name. You mean branches that did exist but did not have PRs associated with them?
Locria Cyber (Nov 01 2021 at 10:43):Yes
Folkert de Vries (Nov 01 2021 at 10:43):@Brian Hicks does git push --all seem safe to you?
Brian Hicks (Nov 01 2021 at 10:43):nooooooooooooooooooooooo
Brian Hicks (Nov 01 2021 at 10:44):git is chock full of footguns
Brian Hicks (Nov 01 2021 at 10:44):I've just finished boopin' the UI buttons to restore branches
Brian Hicks (Nov 01 2021 at 10:44):I think tags get pulled automatically so we should be able to do git push --tags to restore those
Brian Hicks (Nov 01 2021 at 10:45):but I definitely just caused a build storm by reopening all the PRs so let's wait a bit so the queue can calm down
Folkert de Vries (Nov 01 2021 at 10:46):right, let's not touch anything for a while then
Brian Hicks (Nov 01 2021 at 10:47):I hadn't considered branches without PRs, though (hadn't caught up before your @-mention) You're right that that one's tricky. git push --all may fix it, but only for the subset of branches/commits that's on each of our machines. I'm inclined to say that if someone had some WIP that didn't make it to PR, they should just push the latest and make a draft PR.
Brian Hicks (Nov 01 2021 at 10:49):also @Locria Cyber please don't worry too much about this—git makes it all too easy to get into situations like this, so GH and friends have made restores easier than they would be otherwise. The disruption here should be pretty minimal.
Locria Cyber (Nov 01 2021 at 10:49):ok
Locria Cyber (Nov 01 2021 at 10:50):I think git user account has limited access control
Brian Hicks (Nov 01 2021 at 10:52):unfortunately, it really doesn't :grimacing:
Brian Hicks (Nov 01 2021 at 10:52):I guess I'd sum it up by saying "git happens"
Brian Hicks (Nov 01 2021 at 10:53):I see a bunch of rescue_HASH branches in the branch explorer. Did one of you push those?
Brian Hicks (Nov 01 2021 at 10:55):oooh, looks like we need to restore the www branch to fix https://github.com/rtfeldman/roc/pull/1802
Folkert de Vries (Nov 01 2021 at 10:59):I probably have that branch locally, I pulled basically right before this happened. What do I do? just a git push?
Brian Hicks (Nov 01 2021 at 11:06):a git push -u origin HEAD from that particular branch would be the most sure-fire way
Folkert de Vries (Nov 01 2021 at 11:10):ok, did that
Brian Hicks (Nov 01 2021 at 11:15):ok, I think that's the last of the closed PRs.
Brian Hicks (Nov 01 2021 at 11:16):looks like we're still ~45 builds deep in the queue so waiting to push more would be good
Brian Hicks (Nov 01 2021 at 11:16):unless there's any of these workflows we can just cancel? I know it's gonna take a bite out of the quota https://github.com/rtfeldman/roc/actions
Folkert de Vries (Nov 01 2021 at 11:17):there are some that I'm pretty sure will fail
Anton (Nov 01 2021 at 11:18):We're all self-hosted, I'll close some that I know can be closed.
Brian Hicks (Nov 01 2021 at 11:29):oh! I didn’t know we were completely self-hosted. I thought it was just benchmarks!
Anton (Nov 01 2021 at 11:44):I've made issue #1868 to see what steps can be taken to prevent this in the future as well as how we can setup a workflow to restore things quickly in case things do go wrong.
Locria Cyber (Nov 01 2021 at 13:21):Folkert de Vries said:
I probably have that branch locally, I pulled basically right before this happened. What do I do? just a git push?
git reflog show will show the past change of branch/HEAD point to which commits
Locria Cyber (Nov 01 2021 at 13:22):Then you can do git merge <commit hash> from a branch
Folkert de Vries (Nov 01 2021 at 13:23):I got it that branch should be good now
Lucas Rosa (Nov 01 2021 at 14:06):oh ok, I was like wth happened lol
Last updated: Jul 06 2025 at 12:14 UTC