Re: git diff returns fatal error with core.safecrlf is set to true.
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 26, 2013, 15:48 UTC
- Message-ID
- <7vsj04yisa.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <51C9FDC0.5020709@web.de>
Torsten Bögershausen <tboegi@web.de> writes:
Show 15 quoted lines
>> +++ b/diff.c
>> @@ -2647,6 +2647,10 @@ static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
>> int diff_populate_filespec(struct diff_filespec *s, int size_only)
>> {
>> int err = 0;
>> + enum safe_crlf crlf_warn = (safe_crlf != SAFE_CRLF_FAIL
>> + ? safe_crlf
>> + : SAFE_CRLF_WARN);
>
> Thanks,
> Does it makes sense to write it the other way around?
>
> enum safe_crlf crlf_warn = (safe_crlf == SAFE_CRLF_FAIL
> ? SAFE_CRLF_WARN
> : safe_crlf);I didn't see much difference either way, but between "FAIL needs to be demoted to WARN, everything else goes as-is" and the original "We do not care about anything other than FAIL, so use it as-is, but demote FAIL to WARN", yours look shorter. Will replace.