Re: [PATCH] CONTRIBUTING: Move "Coding language and style" section

[Thomas Schwinge <thomas@codesourcery.com>]

Hi Dodji!

On 2021-12-17T19:59:35+0100, Dodji Seketeli <dodji@redhat.com> wrote:
> Thomas Schwinge <thomas@codesourcery.com> a écrit:
>>  CONTRIBUTING | 110 +++++++++++++++++++++++++--------------------------
>>  1 file changed, 55 insertions(+), 55 deletions(-)
>>
>> diff --git CONTRIBUTING CONTRIBUTING
>
> I am not sure why, but on patches I use and receive, this line looks
> like:
>
> diff --git a/CONTRIBUTING b/CONTRIBUTING
>
> See the difference of format?  This is what I get using git
> format-patch.
>
> I am not sure why yours is different.  Any idea?

Yes: local 'git diff' configuration unintentionally leaked into
'git format-patch' as used by 'git send-email'.  I've fixed this;
later patches should apply fine as sent.

> In any case, when I do "git am" on your patch, git refuses to apply it.
> I had to edit the patch so that the line looks like:
>
> diff a/CONTRIBUTING b/CONTRIBUTING
>
> at least.

..., or -- as you supposedly have found out a few minutes later ;-) --
apply with "git am -p0".  Sorry for that.


Grüße
 Thomas
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955