From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: trailing whitespace in some patches I just submitted Date: Tue, 01 Mar 2022 15:27:37 +0100 Message-ID: <1b625c3a-e64e-00f6-9f82-86a94877ddd4@ipfire.org> In-Reply-To: <8EFA31CC-B7FB-4345-A902-8BE8CB0BF45A@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4443065154199891415==" List-Id: --===============4443065154199891415== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On 01/03/2022 14:17, Michael Tremer wrote: > Hello Adolf, >=20 >> On 28 Feb 2022, at 21:34, Adolf Belka wrote: >> >> Hi All, >> >> Peter just flagged up that I had a trailing whitespace on the Dist: line o= f my cifs-utils patch. >> >> >> Just before seeing that email I had just submitted 4 patches for harfbuzz,= hplip, libdnet and ntfs-3g >> >> hplip, which is an addon, also has the trailing whitespace on the Dist: li= ne. >=20 > 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. >=20 > This has also happened in other files. >=20 >> 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 des= ktop machine. I use the same text editing program on both systems, but it may= be that they are not configured the same. >> >> 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. >=20 > It would generally better to rebase your branches against next before sendi= ng anything to the list, because that will automatically take care of such th= ings and literally merge them together. Okay, I will try and remember to do that from now on. Wasn't even aware=20 that was something I could do. Makes sense. >=20 > Ideally, you wouldn=E2=80=99t notice a thing and it just works. >=20 > If it goes wrong (because two people have edited the same lines at the same= time for example), Git will ask you to resolve this because it doesn=E2=80= =99t know what it is actually doing there. >=20 >> Sorry for the problems. >=20 > Not a problem. >=20 >> Should I re-issue the hplip patch or can that be adjusted on the fly? >=20 > 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. I will actually do a v2 patch as I have realised that my first patch has=20 also removed some of the changes that Robin built into the addons. I=20 have marked the first version as superseded in Patchwork so my v2=20 version will replace it. >=20 > -Michael >=20 >> >> >> Regards, >> >> Adolf. >> >=20 --=20 Sent from my laptop --===============4443065154199891415==--