* cat: .git/rebase-merge/head-name: No such file or directory
@ 2010-02-02 19:20 Erik Faye-Lund
2010-02-02 19:25 ` Erik Faye-Lund
0 siblings, 1 reply; 2+ messages in thread
From: Erik Faye-Lund @ 2010-02-02 19:20 UTC (permalink / raw)
To: Git Mailing List, msysGit
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: cat: .git/rebase-merge/head-name: No such file or directory
2010-02-02 19:20 cat: .git/rebase-merge/head-name: No such file or directory Erik Faye-Lund
@ 2010-02-02 19:25 ` Erik Faye-Lund
0 siblings, 0 replies; 2+ messages in thread
From: Erik Faye-Lund @ 2010-02-02 19:25 UTC (permalink / raw)
To: Git Mailing List, msysGit
On Tue, Feb 2, 2010 at 8:20 PM, Erik Faye-Lund <kusmabite@googlemail.com> wrote:
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-02 19:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-02 19:20 cat: .git/rebase-merge/head-name: No such file or directory Erik Faye-Lund
2010-02-02 19:25 ` Erik Faye-Lund
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).