diff options
| author | Cameron McEfee <cameron@github.com> | 2011-06-06 18:43:16 -0700 |
|---|---|---|
| committer | Cameron McEfee <cameron@github.com> | 2011-06-06 18:43:16 -0700 |
| commit | 68b2217289711a4b78c0476b404b351afbbe655f (patch) | |
| tree | 7aa27243949667d1c12ee6518eb8063d83d11c97 /_posts/2011-03-07-egit-bad-tree.markdown | |
| parent | 3f78d29f08fda99eda887aad14f99baf1c71636e (diff) | |
| parent | 7edd04eeaa188cf0e87dfc71b2278785dcdf7ed6 (diff) | |
Merge pull request #30 from github/reorder-nav
Reorder nav, reduce each post to one category, rename for usability
Diffstat (limited to '_posts/2011-03-07-egit-bad-tree.markdown')
| -rw-r--r-- | _posts/2011-03-07-egit-bad-tree.markdown | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/_posts/2011-03-07-egit-bad-tree.markdown b/_posts/2011-03-07-egit-bad-tree.markdown deleted file mode 100644 index 42341dc..0000000 --- a/_posts/2011-03-07-egit-bad-tree.markdown +++ /dev/null @@ -1,56 +0,0 @@ ---- -layout: default -title: Fixing bad tree -description: How to fix the bad tree error on a github repo caused by egit -categories: troubleshooting ---- - -Due to a bug in egit's implementation of the `git rm` command, empty trees may not be removed from the index and result in a "bad tree" error on github: - - - -Fixing the repo ---------------- - -Fixing this error is fairly simple with the commandline. To fix the error you need to recreate the tree and then remove it using `git rm` to ensure it is removed correctly. - -For example, if the bad tree is at `badtree/` we would run: - -<pre class="terminal">tekkub@iSenberg ~/tmp/fixing_bad_tree master -> mkdir badtree - -tekkub@iSenberg ~/tmp/fixing_bad_tree master -> touch badtree/temp - -tekkub@iSenberg ~/tmp/fixing_bad_tree master -> git add badtree/temp - -tekkub@iSenberg ~/tmp/fixing_bad_tree master+ -> git commit -m "Fixing bad tree, step one" -[master dbe6a08] Fixing bad tree, step one - 0 files changed, 0 insertions(+), 0 deletions(-) - create mode 100644 badtree/temp - -tekkub@iSenberg ~/tmp/fixing_bad_tree master -> git rm badtree/temp -rm 'badtree/temp' - -tekkub@iSenberg ~/tmp/fixing_bad_tree master+ -> git commit -m "Fixing bad tree, step two" -[master 46ae6d2] Fixing bad tree, step two - 0 files changed, 0 insertions(+), 0 deletions(-) - delete mode 100644 badtree/temp -</pre> - -We can then confirm the tree is removed by making sure it is not listed by `git ls-tree`: - -<pre class="terminal">tekkub@iSenberg ~/tmp/fixing_bad_tree master -> git ls-tree -r HEAD | grep badtree -</pre> - -If this returns no results, push the repo and everything should be fixed! - -Avoiding future corruption --------------------------- - -We recommend users avoid using egit to remove files from their repos. Always use `git rm` from the command line. |