hive-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dmitry Tolpeko <dmtolp...@gmail.com>
Subject Re: windows line endings and git
Date Tue, 01 Sep 2015 17:41:11 GMT
I develop in Eclipse on Windows, but finally compile, test and use git on
Linux. If the problem is in Windows line endings, I will make sure they
will not appear anymore, sorry.

Dmitry

On Tue, Sep 1, 2015 at 8:17 PM, 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
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message