hive-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alan Gates <alanfga...@gmail.com>
Subject Re: windows line endings and git
Date Tue, 01 Sep 2015 17:41:57 GMT
Me, or Dmitry, or both?

Alan.

> Sergey Shelukhin <mailto:sergey@hortonworks.com>
> September 1, 2015 at 10:38
> Set core.autocrlf to false in git config.
>
> On 15/9/1, 10:17, "Alan Gates"<alanfgates@gmail.com>  wrote:
>
>> After Dmitry checked in HIVE-11536 and I fetched and merged, I had
>> issues in my git repository with line endings.  It insisted on modifying
>> the files without me so much as opening the files, and would not let me
>> switch branches until I dealt with it.  I think it automatically changed
>> the windows ending to the unix ending when I did the merge in from
>> Apache.  I solved this by committing the changes and pushing that back
>> upstream.  I assumed this would work as when I've checked in patches
> >from Dmitry before the right thing seems to happen.  Please let me know
>> if I've messed something up for others.
>>
>> But now to the core question.  Is there something I need to set in my
>> git config to be able to handle this?  Or is there something Dmitry
>> needs to set in his so that when he checks in it doesn't bork unix based
>> users?  I poked around github for information on windows based line
>> endings but it wasn't clear to me what I needed to do.
>>
>> Alan.
>>
>

Mime
View raw message