Bug: no-op "rebase -i" failures (easily reproduceable)

I'm having problems with running commands like "git rebase -i HEAD~40" in my codebase. With git's own git repo, and I got a different error, but I think it's related: I start with a clean tree and issue a no-op git rebase which fails.

$ git --version git version 1.7.7.3

$ git clone git://github.com/gitster/git.git Cloning into 'git'... remote: Counting objects: 129018, done. remote: Compressing objects: 100% (41859/41859), done. remote: Total 129018 (delta 94779), reused 118799 (delta 85455) Receiving objects: 100% (129018/129018), 28.21 MiB | 252 KiB/s, done. Resolving deltas: 100% (94779/94779), done.

$ cd git

$ git checkout -b blow Switched to a new branch 'blow'

$ git branch
* blow
  master

$ EDITOR=echo git rebase -i HEAD~40 /usr/local/google/z/gitblow/git/.git/rebase-merge/git-rebase-todo error: could not apply ec7ff5b... make lineno_width() from blame reusable for others

When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To check out the original branch and stop rebasing run "git rebase --abort". Could not apply ec7ff5b... make lineno_width() from blame reusable for others

******************************************

Zorzella