[hibernate-dev] [Validator] CRLF Git issue

[Gunnar Morling]

Hehe; see it positive, at least you didn't ask why "svn update" doesn't
give you any changes ;-)


2014-05-26 13:58 GMT+02:00 Emmanuel Bernard <emmanuel at hibernate.org>:

> So basically I haven’t touched nor looked at Hibernate Validator for a
> year. Damn.
>
> On 26 May 2014, at 10:28, Gunnar Morling <gunnar at hibernate.org> wrote:
>
> Hi,
>
> Note that this commit is from May 2nd last year.
>
> Historically there had been some files with Windows style line endings in
> the HV repository. It was at this very time that I fixed this; since then
> git takes care of this automatically upon check out (by using LF within the
> repo and converting this to the right OS-dependent style upon check out).
> This is done via a configuration in .gitattributes which causes git to do
> the conversion upon check out.
>
> Now I had somewhat unfortunately done this configuration first and only
> afterwards fixed the concerned files with the wrong format. If you now
> happen to check out one of those few commits between the changed
> configuration in .gitattributes (753a0c7d) and the fix for PatternValidator
> (62bd06a3), git will change the line ending style and give you the changes
> you see in your working copy. To abandon that state, you can e.g. do a "git
> checkout --force master".
>
> Out of interest, what exactly did you to run into this issue?
>
> --Gunnar
>
>
>
>
>
> 2014-05-26 9:58 GMT+02:00 Emmanuel Bernard <emmanuel at hibernate.org>:
>
>> I had a strange problem this morning.
>> It was based on a earlier commit of Hibernate Validator from May 2nd
>> 6bbe986b0ce8e309e23a811db919ce760ae58589
>>
>>     warning: CRLF will be replaced by LF in
>>
>> engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/PatternValidator.java.
>>     The file will have its original line endings in your working
>> directory.
>>
>>
>> I had the following warning and whatever I tried (stash, reset --hard
>> etc) I could not get it fixed. I could have used
>>
>>     git config core.autocrlf false
>>
>> But it feels like hiding the problem. I ended up with a clean clone.
>> Do you guys have any idea of what went wrong? If I checkout the infamous
>> commit, the error reappears.
>>
>> Emmanuel
>>
>> PS: I felt like that
>> http://toub.es/2012/05/28/fatal-crlf-would-be-replaced-lf
>> In fact, I even forgot what I was supposed to check in the first place
>> ;)
>> _______________________________________________
>> hibernate-dev mailing list
>> hibernate-dev at lists.jboss.org
>> https://lists.jboss.org/mailman/listinfo/hibernate-dev
>>
>
>
>