{"thread":{"id":"22493","subject":"cat: .git/rebase-merge/head-name: No such file or directory","startedAt":"2010-02-02T19:20:30Z","lastAt":"2010-02-02T19:25:05Z","messageCount":2,"participants":["Erik Faye-Lund"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"133376","messageId":"40aa078e1002021120u1a692301q1c4f6a952d4df5a3@mail.gmail.com","threadId":"22493","inReplyTo":null,"subject":"cat: .git/rebase-merge/head-name: No such file or directory","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@googlemail.com","sentAt":"2010-02-02T19:20:30Z","receivedAt":"2010-02-02T19:20:30Z","isPatch":false,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"I just applied an interactive rebase to one of my repos, and got a\npretty confusing error message:\n\n$ git rebase -i HEAD~4\n<edit, rebasing ticked forward to the end>\nrm: cannot unlink `/c/Users/kusma/Documents/My\nDropbox/src/gb-asm/.git/rebase-merge/done': Permission denied\nrm: cannot remove directory `/c/Users/kusma/Documents/My\nDropbox/src/gb-asm/.git/rebase-merge': Directory not empty\ncat: .git/rebase-merge/head-name: No such file or directory\n$ git diff\ncat: .git/rebase-merge/head-name: No such file or directory\n$ git status\n# On branch asm-test\nnothing to commit (working directory clean)\ncat: .git/rebase-merge/head-name: No such file or directory\n$\n\nNow, I figure that rm failed due to my virus scanner kicking in, so\nthat's no mystery. And there is a commit in msys AFAIK that makes\nunlink retry on failures. So I expect the issue to go away in future\nversions. However, I'm not entirely sure what to do to repair my repo,\nthough.\n\nAny ideas?\n\n-- \nErik \"kusma\" Faye-Lund\n"},{"id":"133377","messageId":"40aa078e1002021125l5de7dc4fv8eb5d89c9015f26a@mail.gmail.com","threadId":"22493","inReplyTo":"40aa078e1002021120u1a692301q1c4f6a952d4df5a3@mail.gmail.com","subject":"Re: cat: .git/rebase-merge/head-name: No such file or directory","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@googlemail.com","sentAt":"2010-02-02T19:25:05Z","receivedAt":"2010-02-02T19:25:05Z","isPatch":false,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Tue, Feb 2, 2010 at 8:20 PM, Erik Faye-Lund <kusmabite@googlemail.com> wrote:\n> I just applied an interactive rebase to one of my repos, and got a\n> pretty confusing error message:\n>\n> $ git rebase -i HEAD~4\n> <edit, rebasing ticked forward to the end>\n> rm: cannot unlink `/c/Users/kusma/Documents/My\n> Dropbox/src/gb-asm/.git/rebase-merge/done': Permission denied\n> rm: cannot remove directory `/c/Users/kusma/Documents/My\n> Dropbox/src/gb-asm/.git/rebase-merge': Directory not empty\n> cat: .git/rebase-merge/head-name: No such file or directory\n> $ git diff\n> cat: .git/rebase-merge/head-name: No such file or directory\n> $ git status\n> # On branch asm-test\n> nothing to commit (working directory clean)\n> cat: .git/rebase-merge/head-name: No such file or directory\n> $\n>\n> Now, I figure that rm failed due to my virus scanner kicking in, so\n> that's no mystery. And there is a commit in msys AFAIK that makes\n> unlink retry on failures. So I expect the issue to go away in future\n> versions. However, I'm not entirely sure what to do to repair my repo,\n> though.\n>\n\nOK, it turns out these \"cat: .git/rebase-merge/head-name: No such file\nor directory\"-errors are caused by the bash-completion that I\nfoolishly removed in an attempt to reduce noise. \"git show-branch\"\nshows the correct branch for me.\n\n-- \nErik \"kusma\" Faye-Lund\n"}]}