search

bronson / vim-update-bundles

Use Pathogen and Git to manage your Vim plugins.
91 stars 13 forks source link

Don't die when upstream adds a tags file #11

Closed bronson closed 13 years ago

bronson commented 13 years ago

Here's the backtrace:

updating markdown from git://github.com/tpope/vim-markdown.git
updating textile.vim from git://github.com/timcharper/textile.vim.git
error: The following untracked working tree files would be overwritten by merge:
  doc/tags
Please move or remove them before you can merge.
vim-update-bundles/vim-update-bundles:63:in `run': command <<git pull -q origin master>> exited with code 1 (RuntimeError)
  from vim-update-bundles/vim-update-bundles:72:in `git'
  from vim-update-bundles/vim-update-bundles:141:in `block in download_bundle'
  from vim-update-bundles/vim-update-bundles:136:in `chdir'
  from vim-update-bundles/vim-update-bundles:136:in `download_bundle'
  from vim-update-bundles/vim-update-bundles:198:in `block in update_bundles'
  from vim-update-bundles/vim-update-bundles:152:in `block (2 levels) in read_vimrc'
  from vim-update-bundles/vim-update-bundles:152:in `each_line'
  from vim-update-bundles/vim-update-bundles:152:in `block in read_vimrc'
  from vim-update-bundles/vim-update-bundles:151:in `open'
  from vim-update-bundles/vim-update-bundles:151:in `read_vimrc'
  from vim-update-bundles/vim-update-bundles:194:in `update_bundles'
  from vim-update-bundles/vim-update-bundles:227:in `block (2 levels) in update_bundles_and_docs'
bronson commented 13 years ago

This will have the same solution as issue #2: if an error occurs when trying to pull, we just delete the repo and try to clone fresh.

bronson commented 13 years ago

Fixed by 2fdf661b4574c5a12437fa3aac129d53aabc8cef