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
