在本地和服务器上都删除的 Git 恢复分支

Question

I am trying to restore a branch that was deleted about a week ago from the remote server. Since that time I completely blew away my local repo for that project so there is no local version of that branch either. I tried "git fsck" but didn't see anything related to my branch there.

Answer 1

通过git reflog （分支上的最后一次提交）查找 sha 并在命令行提示符下执行git checkout -b <branch> <sha> 。

Answer 2

One possibility would be some local repo somewhere that hasn't done a git fetch --prune , that'd still be tracking the last-known tip.

But failing that, since the branch was deleted on the server "about a week ago", the factory-default expiry on unreferenced objects hasn't passed so auto-gc shouldn't have cleaned it out yet. ssh in to that repo, do

git fsck --lost-found --connectivity-only

and git show or maybe eg git log --online --graph --decorate master..$id the id's in the lost-found/commits directory to see if any of them look good. Any that do, you can make a new branch tip for them, if the commit's still in the repo its history's still there too.

If you don't want to operate on a live server you can just rsync or tar or whatever the repo itself, the whole thing, to wherever you want, then spelunk at leisure. You might have to remove any stray find -name \\*.lock files if somebody was pushing during the copy, or play with the configs if there are any hardwired paths configured going outside the repo itself but that's unusual.