All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tommy Thorn <tommy-git@thorn.ws>
To: git@vger.kernel.org
Subject: git bug: rebase fatal failure
Date: Thu, 15 May 2008 00:27:51 -0700	[thread overview]
Message-ID: <482BE5F7.2050108@thorn.ws> (raw)

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

             reply	other threads:[~2008-05-16  7:42 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-15  7:27 Tommy Thorn [this message]
2008-05-16 10:41 ` git bug: rebase fatal failure Johannes Schindelin
2008-05-16 11:01   ` Johannes Schindelin
2008-05-16 13:03     ` [PATCH] mailsplit and mailinfo: gracefully handle NUL characters Johannes Schindelin
2008-05-16 14:03       ` Avery Pennarun
2008-05-16 14:05         ` David Kastrup
2008-05-16 14:32         ` Johannes Schindelin
2008-05-16 14:56           ` Avery Pennarun
2008-05-16 23:59             ` Johannes Schindelin
2008-05-17  0:06               ` Tommy Thorn
2008-05-17  0:26                 ` Johannes Schindelin
2008-05-17 10:07               ` Stephen R. van den Berg
2008-05-17 10:18                 ` Johannes Schindelin
     [not found]       ` <200805161539.29259.brian.foster@innova-card.com>
2008-05-16 14:07         ` Brian Foster
2008-05-16 14:14           ` David Kastrup
2008-05-16 14:29           ` Johannes Schindelin
2008-05-16 14:33             ` David Kastrup
2008-05-21 18:08       ` Junio C Hamano
2008-05-22 10:38         ` Johannes Schindelin
2008-05-22 17:44           ` Junio C Hamano
2008-05-23 11:21             ` Johannes Schindelin

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=482BE5F7.2050108@thorn.ws \
    --to=tommy-git@thorn.ws \
    --cc=git@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.