Your message dated Mon, 10 Sep 2007 07:08:23 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#436182: /usr/bin/git-rebase: sometimes fails with "fatal:
corrupt patch"
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: git-core
Version: 1:1.5.2.4-1
Severity: normal
File: /usr/bin/git-rebase
I tried to rebase a commit, that was both quite large and affected a lot
of binary files, and got "fatal: corrupt patch".
~/git/psas/wiki$ git-rebase origin
First, rewinding head to replay your work on top of it...
Checking 2526 files out...
100% (2526/2526) done
HEAD is now at fce99a8... LaunchLogistics20050108: Remove page for
launch that did not happen
Applying Move historical events and meetings to a news/YYYY-MM-DD
hierarchy.
fatal: corrupt patch at line 2712187
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".
You can view the commit in question here:
http://svcs.cs.pdx.edu/cgi-bin/gitweb.cgi?p=psas/wiki.git;a=commit;h=cc15922ec5a1def1eac6514c9ce184b65d6a349d
or, if you have bandwidth/storage/patience to clone a 755MB repository:
git://psas.pdx.edu/git/psas/wiki.git
I seem to recall a similar problem a couple of days ago with the same
version of git, though I'm fuzzy on the details. I think maybe it
involved very small patches touching binary files. I don't recall
encountering git-rebase issues with the 1.4 series and earlier, but I
wasn't working with this repository yet either.
-- System Information:
Debian Release: 4.0
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.21-2-686
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Versions of packages git-core depends on:
ii libc6 2.6-2 GNU C Library: Shared libraries
ii libcurl3-gnutls 7.16.4-1 Multi-protocol file transfer libra
ii libdigest-sha1-perl 2.11-1 NIST SHA-1 message digest algorith
ii liberror-perl 0.15-8 Perl module for error/exception ha
ii libexpat1 1.95.8-3.3 XML parsing C library - runtime li
ii perl-modules 5.8.8-7 Core Perl modules
ii zlib1g 1:1.2.3.3.dfsg-5 compression library - runtime
Versions of packages git-core recommends:
ii curl 7.15.5-1 Get a file from an HTTP, HTTPS, FT
ii git-doc 1:1.4.4.2-1 content addressable filesystem (do
ii less 394-4 Pager program similar to more
ii openssh-client [ssh-client] 1:4.3p2-8 Secure shell client, an rlogin/rsh
ii patch 2.5.9-4 Apply a diff file to an original
ii rsync 2.6.9-2 fast remote file copy program (lik
-- no debconf information
signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
On Sun, Aug 05, 2007 at 08:19:51PM -0700, Jamey Sharp wrote:
> I tried to rebase a commit, that was both quite large and affected a lot
> of binary files, and got "fatal: corrupt patch".
>
> ~/git/psas/wiki$ git-rebase origin
> First, rewinding head to replay your work on top of it...
> Checking 2526 files out...
> 100% (2526/2526) done
> HEAD is now at fce99a8... LaunchLogistics20050108: Remove page for
> launch that did not happen
>
> Applying Move historical events and meetings to a news/YYYY-MM-DD
> hierarchy.
>
> fatal: corrupt patch at line 2712187
> 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".
>
> You can view the commit in question here:
>
> http://svcs.cs.pdx.edu/cgi-bin/gitweb.cgi?p=psas/wiki.git;a=commit;h=cc15922ec5a1def1eac6514c9ce184b65d6a349d
> or, if you have bandwidth/storage/patience to clone a 755MB repository:
> git://psas.pdx.edu/git/psas/wiki.git
Hi Jamey,
the problem here is that git doesn't recognize a file as binary content,
because it only inspects the first 8000 bytes of data. The pdf in
question that makes the patch corrupt includes NULL bytes not within the
first 8000 bytes, but later.
To fix the problem, you need to tell git that it should handle the pdf,
or better all pdf's, as binary files, using gitattributes(5).
I suggest
$ echo '*.pdf -diff' >>.git/info/attributes
See the gitattributes(5) man page and
http://thread.gmane.org/gmane.comp.version-control.git/58057
Regards, Gerrit.
--- End Message ---
