diff options
| author | tekkub <tekkub@gmail.com> | 2010-02-03 14:22:25 -0700 |
|---|---|---|
| committer | tekkub <tekkub@gmail.com> | 2010-02-03 14:22:25 -0700 |
| commit | da817de0c79386fc82487d55ef31e2825b23a039 (patch) | |
| tree | 5fb86690c1f418cc7b8c1037c27d757ceed870bd /_posts/2009-11-16-egit-corruption.markdown | |
| parent | 71e9d51850399e871261cd9b8da380432602a41d (diff) | |
git remote set-head doesn't set HEAD on the remote... I'm so S M R T
Diffstat (limited to '_posts/2009-11-16-egit-corruption.markdown')
| -rw-r--r-- | _posts/2009-11-16-egit-corruption.markdown | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/_posts/2009-11-16-egit-corruption.markdown b/_posts/2009-11-16-egit-corruption.markdown index 62dfd04..525d117 100644 --- a/_posts/2009-11-16-egit-corruption.markdown +++ b/_posts/2009-11-16-egit-corruption.markdown @@ -21,16 +21,20 @@ Correcting the remote repo To correct the remote repo the missing objects need to be re-pushed from an uncorrupted repo. This should be done from the command line, not from egit. To start, run `git fsck` on your local repo to ensure it has not been corrupted. If you do not receive any errors about broken links or missing objects, you're clear to continue. -Re-pushing is a simple matter of deleting the remote branch and then pushing it again. If the branch being deleted is the default branch on the remote you'll need to replace it temporarily. We'll use the first commit in the branch so that we can ensure all the other commits are re-pushed. +Re-pushing is a simple matter of deleting the remote branch and then pushing it again. We'll use the first commit in the branch so that we can ensure all the other commits are re-pushed. + +If the branch being deleted is the default branch on the remote you'll need to replace it temporarily. You can do this in the repo's admin page: + + <pre class="terminal">$ git log --pretty=oneline | tail -n 1 <span class="comment"># Find the first commit</span> 3b70d98cb968fc35f0c99acfe4d5dfa976ed2536 Initial commit $ git branch temp_default 3b70d98cb968fc35f0c99acfe4d5dfa976ed2536 $ git push origin temp_default -$ git remote set-head origin temp_default <span class="comment"># Change the remote default branch</span> +<span class="comment"># Change the remote default branch to temp_default</span> $ git push origin :master $ git push origin master -$ git remote set-head origin master <span class="comment"># Set things back to master</span> +<span class="comment"># Set the remote default back to master</span> $ git push origin :temp_default</pre> You may need to do this for many branches if the remote repo has more than one branch that was pushed by egit. You can skip `git remote set-head` for these other branches. |