From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: trailing whitespace in some patches I just submitted Date: Tue, 01 Mar 2022 13:17:51 +0000 Message-ID: <8EFA31CC-B7FB-4345-A902-8BE8CB0BF45A@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6798234951147513267==" List-Id: --===============6798234951147513267== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello Adolf, > On 28 Feb 2022, at 21:34, Adolf Belka wrote: >=20 > Hi All, >=20 > Peter just flagged up that I had a trailing whitespace on the Dist: line of= my cifs-utils patch. >=20 >=20 > Just before seeing that email I had just submitted 4 patches for harfbuzz, = hplip, libdnet and ntfs-3g >=20 > hplip, which is an addon, also has the trailing whitespace on the Dist: lin= e. This has been traditionally carried over for decades. It shouldn=E2=80=99t be= there as it serves no purpose, but Peter has decided to remove them all. This has also happened in other files. > I don't know definitely why this is happening but I think I copied the lfs = files on a laptop via an ssh connection and normally I do the work on my desk= top machine. I use the same text editing program on both systems, but it may = be that they are not configured the same. >=20 > I will try and find out and fix the cause for the problem and in the short = term I will do everything on my desktop machine. It would generally better to rebase your branches against next before sending= anything to the list, because that will automatically take care of such thin= gs and literally merge them together. Ideally, you wouldn=E2=80=99t notice a thing and it just works. If it goes wrong (because two people have edited the same lines at the same t= ime for example), Git will ask you to resolve this because it doesn=E2=80=99t= know what it is actually doing there. > Sorry for the problems. Not a problem. > Should I re-issue the hplip patch or can that be adjusted on the fly? If the patch is being edited, Patchwork won=E2=80=99t pick it up any more. I = would personally just leave this as is and live with the whitespace error. It= is not the end of the world. -Michael >=20 >=20 > Regards, >=20 > Adolf. >=20 --===============6798234951147513267==--