> On 06 Jan 2018, at 00:22, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Lars Schneider <larsxschneider@xxxxxxxxx> writes: > >>> On 31 Dec 2017, at 09:05, tboegi@xxxxxx wrote: >>> >>> From: Torsten Bögershausen <tboegi@xxxxxx> >>> >>> When calling convert_to_git(), the checksafe parameter has been used to >>> check if commit would give a non-roundtrip conversion of EOL. >>> >>> When checksafe was introduced, 3 values had been in use: >>> SAFE_CRLF_FALSE: no warning >>> SAFE_CRLF_FAIL: reject the commit if EOL do not roundtrip >>> SAFE_CRLF_WARN: warn the user if EOL do not roundtrip >> >> In general, I really like the direction as this simplifies >> my patch later on in 5/5. However, I see a few problems: >> ... > > Yes, this looks like a sensible way to go. I saw Torsten's v3 for > 1/5 but will end up queuing v2b, as I suspect 5/5 would need to be > adjusted for the change between the two versions. I just send out my v3 which integrates the latest version of Torsten's patch into my series: https://public-inbox.org/git/20180106004808.77513-1-lars.schneider@xxxxxxxxxxxx/ Please note: I did not rebase my series. Therefore, there is a small conflict with 86ff70a0f0 (convert: tighten the safe autocrlf handling, 2017-11-26) because has_cr_in_index() was renamed to has_crlf_in_index(). @Junio: What do you prefer in these cases? A rebased series or the conflict? Thanks, Lars
