On 05/28/15 17:58, Ard Biesheuvel wrote:
> On 28 May 2015 at 17:40, Olivier Martin <[email protected]> wrote:
>> Contributed-under: TianoCore Contribution Agreement 1.0
>> Signed-off-by: Olivier Martin <[email protected]>
>
> Could you please regenerate this diff after setting [diff]
> renames=true in .git/config?
> And perhaps add --stat=200 so we can read the full path names?
>
In fact edk2 patches can be applied from the mailing list too, with a
number of tricks:
(1) In the receiving git repo, add the following settings:
[core]
whitespace = cr-at-eol
[am]
keepcr = true
(2) Save the patch email from your MUA to a regular file. The file
should be a pristine copy of the email.
(3) At this point you can directly apply patches with "git am" *if* the
patches do not contain /dev/null headers -- which is equivalent to
saying that the patches neither create nor remove files. This somewhat
unfortunate restriction exists because git does not consider the
"am.keepcr" setting when it comes to /dev/null headers, and the \r after
the /dev/null string trips it up; the patch will be rejected.
In this particular example (where a bunch of files are renamed) we have
a great number of such /dev/null\r headers, so the following processing
is required, in order to strip the \r's:
sed -r 's,^((---|\+\+\+) /dev/null)\r$,\1,'
(4) The output of the above sed command can be applied with git-am, and
then reformatted as a patch any way you'd like.
I'll repost Olivier's patch as a followup to this message, reformatted
as described above.
Thanks
Laszlo
------------------------------------------------------------------------------
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-devel
