On Wed, Mar 27, 2013 at 10:41 PM, Arnd Bergmann <arnd@xxxxxxxx> wrote:
> On Wednesday 27 March 2013, Peter Vasil wrote:
>> Hi, unfortunately I still can't apply it on 3.9-rc4 :-(
>>
>> $ git apply --check ehci-dt-bus-glue.patch
>> error: removal patch leaves file contents
>> error: drivers/usb/host/ehci-vt8500.c: patch does not apply
>>
>> Looks git really doesn't like ehci-vt8500.c removal. If I delete the
>> file manually, "git diff" actually outputs full file content prefixed
>> with "-".
>
> Are you using an old git version? I normally use 'git format-patch -M -D'
> to produce patches in the reduced format that handles moves and deletions
> nicer but is incompatible with older versions of 'patch'.
>
> I'll fix up the changelog to mention the correct driver and resend without -D.
>
> Arnd
Hm, no idea what the latest versions are :-) I use archlinux, with
latest updates installed.
Here are my git and patch versions:
$ git --version
git version 1.8.2
$ patch --version
GNU patch 2.7.1
Btw. my git understands format-patch -D, but its help looks a bit suspicous:
-D, --irreversible-delete
Omit the preimage for deletes, i.e. print only the header
but not the diff between the preimage and /dev/null. The
resulting patch is not meant to be applied with patch nor
git apply; this is solely for people who want to just
concentrate on reviewing the text after the change. In
addition, the output obviously lack enough information to
apply such a patch in reverse, even manually, hence the
name of the option.
When used together with -B, omit also the preimage in the
deletion part of a delete/create pair.
Perhaps there is a newer version that can also apply such a reduced patch?
Regards,
Peter
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
