git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git bug: rebase fatal failure

From
TTTommy 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".

Next: Johannes Schindelin
Message 1 of 21 in “git bug: rebase fatal failure”
  1. Tommy ThornMay 15, 2008
  2. Johannes SchindelinMay 16, 2008
  3. Johannes SchindelinMay 16, 2008
  4. mailsplit and mailinfo: gracefully handle NUL charactersJohannes Schindelin, May 16, 2008
  5. Avery PennarunMay 16, 2008
  6. David KastrupMay 16, 2008
  7. Johannes SchindelinMay 16, 2008
  8. Avery PennarunMay 16, 2008
  9. Johannes SchindelinMay 16, 2008
  10. Tommy ThornMay 17, 2008
  11. Johannes SchindelinMay 17, 2008
  12. Stephen R. van den BergMay 17, 2008
  13. Johannes SchindelinMay 17, 2008
  14. Junio C HamanoMay 21, 2008
  15. Johannes SchindelinMay 22, 2008
  16. Junio C HamanoMay 22, 2008
  17. Johannes SchindelinMay 23, 2008
  18. Brian FosterMay 16, 2008
  19. David KastrupMay 16, 2008
  20. Johannes SchindelinMay 16, 2008
  21. David KastrupMay 16, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.