Bug#607044: git: rebase doesn't work with diff.noprefix=true

Package: git
Version: 1:1.7.2.3-2.1
Severity: normal

With my default setting in ~/.gitconfig
[diff]
noprefix = true

"git rebase" says
Applying: ...
fatal: git diff header lacks filename information when removing 1
leading
pathname components (line 9)
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed

Without the setting I get
Applying: ...
Applying: ...

So it seems that the (display-only) setting conflicts with the internal
operation of git.




Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.34-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_AT.UTF-8, LC_CTYPE=de_AT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages git depends on:
ii libc6 2.11.2-7 Embedded GNU C Library: Shared lib
ii libcurl3-gnutls 7.21.2-4 Multi-protocol file transfer libra
ii liberror-perl 0.17-1 Perl module for error/exception ha
ii libexpat1 2.0.1-7 XML parsing C library - runtime li
ii perl-modules 5.10.1-16 Core Perl modules
ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime

Versions of packages git recommends:
ii less 436-1 pager program similar to more
ii openssh-client [ssh-clie 1:5.5p1-5+b1 secure shell (SSH) client, for sec
ii patch 2.6.1.85-423d-2 Apply a diff file to an original
ii rsync 3.0.7-2 fast remote file copy program (lik

Versions of packages git suggests:
pn git-arch <none> (no description available)
pn git-cvs <none> (no description available)
pn git-daemon-run <none> (no description available)
pn git-doc <none> (no description available)
pn git-email <none> (no description available)
ii git-gui 1:1.7.2.3-2.1 fast, scalable, distributed revisi
pn git-svn <none> (no description available)
ii gitk 1:1.7.2.3-2.1 fast, scalable, distributed revisi
pn gitweb <none> (no description available)




To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org