From: Erik Faye-Lund <kusmabite@googlemail.com>
Date: Tue, 02 Feb 2010 19:20:30 GMT
Subject: cat: .git/rebase-merge/head-name: No such file or directory
Message-ID: <40aa078e1002021120u1a692301q1c4f6a952d4df5a3@mail.gmail.com>

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.

Any ideas?

-- 
Erik "kusma" Faye-Lund