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