gbp pq: git-apply sometimes fails if patch introduces a completely new file

On Fri, May 27, 2016 at 05:45:33PM +0200, Guido Günther wrote:
> Package: git-buildpackage
> Version: 0.7.5
> Severity: normal
> 
> gbp-pq import fails when the file doesn't exist at all. Offender is
> again
> 
>     
> http://security.debian.org/debian-security/pool/updates/main/e/eglibc/eglibc_2.13-38+deb7u10.dsc
> 
>    $ gbp pq import 
>    gbp:error: Failed to apply 
> 'debian/patches/any/cvs-nl_langinfo-static.diff': Error running git apply: 
> error: localedata/tst-langinfo-static.c: does not exist in index
>    gbp:error: Couldn't apply patches
> 

…however this doesn't always happen. If we split out the file additions
in this patch git apply happily applies them. Needs more investigation.

Reply via email to