linux-kernel - Re: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 19 Jul 2007 18:25:52 +0200 (CEST)
From:	Jan Engelhardt <jengelh@...putergmbh.de>
To:	Alexey Dobriyan <adobriyan@...il.com>
cc:	S.Çağlar Onur <caglar@...dus.org.tr>,
	adobriyan@...ru, Andrew Morton <akpm@...ux-foundation.org>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	David Woodhouse <dwmw2@...radead.org>,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Revert part of 3f1b0e1f287547903f11fa1e6de7d2765597766e


On Jul 18 2007 22:52, Alexey Dobriyan wrote:
>
>On Wed, Jul 18, 2007 at 09:03:13PM +0300, S.Çağlar Onur wrote:
>> With 3f1b0e1f287547903f11fa1e6de7d2765597766e Linus's current git tree starts 
>> to ignore any *.orig or *.rej files (for example "git status" cannot show 
>> what are they) but if there are some *.orig or *.rej files exists, for 
>> whatever reason, that means some unresolved merge conflicts occured for that 
>> code tree and this tree is no longer trusted so better not to ignore these.
>
>*.orig are generated even if line numbers change a bit, so untrusted is
>a somewhat exaggerated.

So use --no-backup-if-mismatch (IIRC).

>> --- a/.gitignore
>> +++ b/.gitignore
>> @@ -45,6 +45,3 @@ series
>>  
>>  # cscope files
>>  cscope.*
>> -
>> -*.orig
>> -*.rej

Ok to me.


	Jan
--