Re: cat: .git/rebase-merge/head-name: No such file or directory
- From
Erik Faye-Lund <kusmabite@googlemail.com>
- Date
- Feb 2, 2010, 19:25 UTC
- Message-ID
- <40aa078e1002021125l5de7dc4fv8eb5d89c9015f26a@mail.gmail.com>
- In-Reply-To
- <40aa078e1002021120u1a692301q1c4f6a952d4df5a3@mail.gmail.com>
On Tue, Feb 2, 2010 at 8:20 PM, Erik Faye-Lund <kusmabite@googlemail.com> wrote:
Show 24 quoted lines
> I just applied an interactive rebase to one of my repos, and got a > pretty confusing error message: > > $ git rebase -i HEAD~4 > <edit, rebasing ticked forward to the end> > rm: cannot unlink `/c/Users/kusma/Documents/My > Dropbox/src/gb-asm/.git/rebase-merge/done': Permission denied > rm: cannot remove directory `/c/Users/kusma/Documents/My > Dropbox/src/gb-asm/.git/rebase-merge': Directory not empty > cat: .git/rebase-merge/head-name: No such file or directory > $ git diff > cat: .git/rebase-merge/head-name: No such file or directory > $ git status > # On branch asm-test > nothing to commit (working directory clean) > cat: .git/rebase-merge/head-name: No such file or directory > $ > > Now, I figure that rm failed due to my virus scanner kicking in, so > that's no mystery. And there is a commit in msys AFAIK that makes > unlink retry on failures. So I expect the issue to go away in future > versions. However, I'm not entirely sure what to do to repair my repo, > though. >
OK, it turns out these "cat: .git/rebase-merge/head-name: No such file or directory"-errors are caused by the bash-completion that I foolishly removed in an attempt to reduce noise. "git show-branch" shows the correct branch for me.
-- Erik "kusma" Faye-Lund