You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@hive.apache.org by Alan Gates <al...@gmail.com> on 2015/09/01 19:17:37 UTC
windows line endings and git
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.
Re: windows line endings and git
Posted by Alan Gates <al...@gmail.com>.
I'm not saying it's your fault. We need to be able to support people
developing on Windows, Linux, and Mac. I just wanted to know who needs
to set what to make this happen.
Alan.
> Dmitry Tolpeko <ma...@gmail.com>
> September 1, 2015 at 10:41
> 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
>
>
Re: windows line endings and git
Posted by Dmitry Tolpeko <dm...@gmail.com>.
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 <al...@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.
>
Re: windows line endings and git
Posted by Sergey Shelukhin <se...@hortonworks.com>.
You :)
From: Alan Gates <al...@gmail.com>>
Reply-To: "dev@hive.apache.org<ma...@hive.apache.org>" <de...@hive.apache.org>>
Date: Tuesday, September 1, 2015 at 10:41
To: "dev@hive.apache.org<ma...@hive.apache.org>" <de...@hive.apache.org>>
Subject: Re: windows line endings and git
Me, or Dmitry, or both?
Alan.
[cid:part1.03060807.01010804@gmail.com]
Sergey Shelukhin<ma...@hortonworks.com>
September 1, 2015 at 10:38
Set core.autocrlf to false in git config.
On 15/9/1, 10:17, "Alan Gates" <al...@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.
Re: windows line endings and git
Posted by Alan Gates <al...@gmail.com>.
Me, or Dmitry, or both?
Alan.
> Sergey Shelukhin <ma...@hortonworks.com>
> September 1, 2015 at 10:38
> Set core.autocrlf to false in git config.
>
> On 15/9/1, 10:17, "Alan Gates"<al...@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.
>>
>
Re: windows line endings and git
Posted by Sergey Shelukhin <se...@hortonworks.com>.
Set core.autocrlf to false in git config.
On 15/9/1, 10:17, "Alan Gates" <al...@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.
>