From: Erik Faye-Lund <kusmabite@googlemail.com>
To: Git Mailing List <git@vger.kernel.org>,
msysGit <msysgit@googlegroups.com>
Subject: Re: cat: .git/rebase-merge/head-name: No such file or directory
Date: Tue, 2 Feb 2010 20:25:05 +0100 [thread overview]
Message-ID: <40aa078e1002021125l5de7dc4fv8eb5d89c9015f26a@mail.gmail.com> (raw)
In-Reply-To: <40aa078e1002021120u1a692301q1c4f6a952d4df5a3@mail.gmail.com>
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
prev parent reply other threads:[~2010-02-02 19:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=40aa078e1002021125l5de7dc4fv8eb5d89c9015f26a@mail.gmail.com \
--to=kusmabite@googlemail.com \
--cc=git@vger.kernel.org \
--cc=kusmabite@gmail.com \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).