Re: trailing whitespace in some patches I just submitted

[Adolf Belka <adolf.belka@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2300 bytes --]



On 01/03/2022 14:17, Michael Tremer wrote:
> Hello Adolf,
> 
>> On 28 Feb 2022, at 21:34, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>
>> Hi All,
>>
>> Peter just flagged up that I had a trailing whitespace on the Dist: line of 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: line.
> 
> This has been traditionally carried over for decades. It shouldn’t 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 desktop 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.
> 
> It would generally better to rebase your branches against next before sending anything to the list, because that will automatically take care of such things and literally merge them together.
Okay, I will try and remember to do that from now on. Wasn't even aware 
that was something I could do. Makes sense.
> 
> Ideally, you wouldn’t notice a thing and it just works.
> 
> 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’t 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’t 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 
also removed some of the changes that Robin built into the addons. I 
have marked the first version as superseded in Patchwork so my v2 
version will replace it.
> 
> -Michael
> 
>>
>>
>> Regards,
>>
>> Adolf.
>>
> 

-- 
Sent from my laptop