From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id 812F43858407 for ; Fri, 17 Dec 2021 22:06:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 812F43858407 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com IronPort-SDR: +NhOb+WqQijGy/FwWa4NHRkqLpXPcOohKcEYh2IGnnCEa4Za8U5berhwyJGa5fXpfHpoM7T4+x 4tBRmGZr6DzFvDovDAnKuWHgs9EtH2edk4+iIe514NJXUuE15k8DZFWzQiwX08SmxnH2LFTEma /KO9wvTZ5zDaClNyLjGAw0OMgsXHg9mjI0Yx2wRAmuWsbE/LAFvz1FV4qOvpk5FzzCdO1UHHfo 2CuG2tN2wNywrHYiqMz49xuHY91S6+yhM7ZAT6Pjh9/mpxFfKWkw77NkhFWhpvs52qp3RnnS72 cDPdZQIYb+gle3iEKUnSVWxH X-IronPort-AV: E=Sophos;i="5.88,214,1635235200"; d="scan'208";a="69860937" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 17 Dec 2021 14:06:33 -0800 IronPort-SDR: dLurnDCpv81yFwAPF2qlaiOz7ASC7rJioKHeM2S61BiZ8t+eqg09rz6nrRbYStA/BvJZAYgodz m7UqnPVSqrXh5KAhhwPdrYtwxffgHjTvvql8iuN7mHU+uX2JnNQwJAmqcRhk0TOvM7kSjeLjuN X70L5r0Y9YTZca5Al3AHYyyidOWZlSqQW4Kt6qOvXUVC7tZX+FmYoJWK+sKXhWWd1VcjLUGutD 8urSX0hzUbiYn16lfsYY3JtO+i2VBglQTjfjleT7lIya/PenY+zB9yq2y4gEzj6GmM+K/gOKMx dRU= From: Thomas Schwinge To: Dodji Seketeli CC: Subject: Re: [PATCH] CONTRIBUTING: Move "Coding language and style" section In-Reply-To: <87h7b79hwo.fsf@seketeli.org> References: <86ft4nowan.fsf@redhat.com> <20211211175822.950836-1-thomas@codesourcery.com> <87h7b79hwo.fsf@seketeli.org> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/27.1 (x86_64-pc-linux-gnu) Date: Fri, 17 Dec 2021 23:06:27 +0100 Message-ID: <87ee6ayjh8.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Dec 2021 22:06:37 -0000 Hi Dodji! On 2021-12-17T19:59:35+0100, Dodji Seketeli wrote: > Thomas Schwinge a =C3=A9crit: >> 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=C3=BC=C3=9Fe Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955