Hi,
Аccidentally my colleague created a file in the root dir of the git repo called - (just dash).
As result for every commit having this file, diff , merge, cherry-pick maybe others just hang.
I tried to make rebase interactive to edit the commit and remove the file but that fails too.
system: Fedora Linux 3.4.2-1.fc16.x86_64
git version: 1.7.7.6
How to reproduce the bug:
1. create a file named -
2. add the file in the index and commit
3. try diff with another commit, branch
So far i found following workarounds:
1. You can delete the file. Then the problem stays in the history only for the commits that have the file.
2. Use git filter-branch and deleted the file from the history.
git filter-branch --index-filter "git rm -rf --cached --ignore-unmatch -- -" <problem commit>..HEAD
But this changes the history.
Thanks for your work.
Regards,
Daniel Lyubomirov