git bug: rebase fatal failure
- From
- Tommy Thorn <tommy-git@thorn.ws>
- Date
- May 15, 2008, 07:27 UTC
- Message-ID
- <482BE5F7.2050108@thorn.ws>
Hi,
I have large-ish repository (143 MB) where git rebase failed unexpectedly (see below). If anyone is interested in looking at this, I have left a copy of the repository at http://thorn.ws/git-fatal-rebase-error.tar.gz
Tommy PS: Please add me in CC as I'm no longer on this list.
$ git --version git version 1.5.5.1.93.ge3f3e
$ git rebase cacao my-cacao-build
First, rewinding head to replay your work on top of it...
Applying Import binutils-2.18
.dotest/patch:16878: trailing whitespace.
.dotest/patch:17923: trailing whitespace.
0. Additional Definitions.
.dotest/patch:18024: trailing whitespace.
Version.
.dotest/patch:18094: trailing whitespace.
//
.dotest/patch:18099: trailing whitespace.
//
fatal: corrupt patch at line 260912
Patch failed at 0001.When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort".