You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@hc.apache.org by sebb <se...@gmail.com> on 2017/06/29 19:09:25 UTC

Git core repos: issues with EOLs

There seem to be some EOL issues with .travis.yml and README.md in core-master.

I cloned a fresh copy (MacOSX) and git status shows changes:

On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   .travis.yml
    modified:   README.md

I'm not a git guru so have no idea how to fix this so it also works in Windows.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
For additional commands, e-mail: dev-help@hc.apache.org


Re: Git core repos: issues with EOLs

Posted by Gary Gregory <ga...@gmail.com>.
On Thu, Jun 29, 2017 at 4:05 PM, sebb <se...@gmail.com> wrote:

> On 29 June 2017 at 20:55, Gary Gregory <ga...@gmail.com> wrote:
> > On Thu, Jun 29, 2017 at 12:23 PM, sebb <se...@gmail.com> wrote:
> >
> >> On 29 June 2017 at 20:13, Gary Gregory <ga...@gmail.com> wrote:
> >> > Try
> >> >
> >> > git config --global core.autocrlf input
> >> >
> >> > Then clone.
> >>
> >> I already have that set.
> >>
> >> Note that I cloned several of the HC repos and they exhibit different
> >> behaviour.
> >>
> >> I don't have the same issue with the -client repos
> >>
> >
> > Maybe the EOLs are messed up in the files themselves.
>
> They appear to have CRLF when I look at them on MacOSX
>
> I think you added them.
>
> So maybe there is a problem with your setup that caused them to be
> stored with CRLF line terminations.
>

It's possible that I committed the bogus EOLs before I set up my global
options on this newish laptop.

Gary


>
> > Gary
> >
> >>
> >> > Gary
> >> >
> >> > On Jun 29, 2017 12:09 PM, "sebb" <se...@gmail.com> wrote:
> >> >
> >> >> There seem to be some EOL issues with .travis.yml and README.md in
> >> >> core-master.
> >> >>
> >> >> I cloned a fresh copy (MacOSX) and git status shows changes:
> >> >>
> >> >> On branch master
> >> >> Your branch is up-to-date with 'origin/master'.
> >> >> Changes not staged for commit:
> >> >>   (use "git add <file>..." to update what will be committed)
> >> >>   (use "git checkout -- <file>..." to discard changes in working
> >> directory)
> >> >>
> >> >>     modified:   .travis.yml
> >> >>     modified:   README.md
> >> >>
> >> >> I'm not a git guru so have no idea how to fix this so it also works
> in
> >> >> Windows.
> >> >>
> >> >> ------------------------------------------------------------
> ---------
> >> >> To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
> >> >> For additional commands, e-mail: dev-help@hc.apache.org
> >> >>
> >> >>
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
> >> For additional commands, e-mail: dev-help@hc.apache.org
> >>
> >>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
> For additional commands, e-mail: dev-help@hc.apache.org
>
>

Re: Git core repos: issues with EOLs

Posted by sebb <se...@gmail.com>.
On 29 June 2017 at 20:55, Gary Gregory <ga...@gmail.com> wrote:
> On Thu, Jun 29, 2017 at 12:23 PM, sebb <se...@gmail.com> wrote:
>
>> On 29 June 2017 at 20:13, Gary Gregory <ga...@gmail.com> wrote:
>> > Try
>> >
>> > git config --global core.autocrlf input
>> >
>> > Then clone.
>>
>> I already have that set.
>>
>> Note that I cloned several of the HC repos and they exhibit different
>> behaviour.
>>
>> I don't have the same issue with the -client repos
>>
>
> Maybe the EOLs are messed up in the files themselves.

They appear to have CRLF when I look at them on MacOSX

I think you added them.

So maybe there is a problem with your setup that caused them to be
stored with CRLF line terminations.

> Gary
>
>>
>> > Gary
>> >
>> > On Jun 29, 2017 12:09 PM, "sebb" <se...@gmail.com> wrote:
>> >
>> >> There seem to be some EOL issues with .travis.yml and README.md in
>> >> core-master.
>> >>
>> >> I cloned a fresh copy (MacOSX) and git status shows changes:
>> >>
>> >> On branch master
>> >> Your branch is up-to-date with 'origin/master'.
>> >> Changes not staged for commit:
>> >>   (use "git add <file>..." to update what will be committed)
>> >>   (use "git checkout -- <file>..." to discard changes in working
>> directory)
>> >>
>> >>     modified:   .travis.yml
>> >>     modified:   README.md
>> >>
>> >> I'm not a git guru so have no idea how to fix this so it also works in
>> >> Windows.
>> >>
>> >> ---------------------------------------------------------------------
>> >> To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
>> >> For additional commands, e-mail: dev-help@hc.apache.org
>> >>
>> >>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
>> For additional commands, e-mail: dev-help@hc.apache.org
>>
>>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
For additional commands, e-mail: dev-help@hc.apache.org


Re: Git core repos: issues with EOLs

Posted by Gary Gregory <ga...@gmail.com>.
On Thu, Jun 29, 2017 at 12:23 PM, sebb <se...@gmail.com> wrote:

> On 29 June 2017 at 20:13, Gary Gregory <ga...@gmail.com> wrote:
> > Try
> >
> > git config --global core.autocrlf input
> >
> > Then clone.
>
> I already have that set.
>
> Note that I cloned several of the HC repos and they exhibit different
> behaviour.
>
> I don't have the same issue with the -client repos
>

Maybe the EOLs are messed up in the files themselves.

Gary

>
> > Gary
> >
> > On Jun 29, 2017 12:09 PM, "sebb" <se...@gmail.com> wrote:
> >
> >> There seem to be some EOL issues with .travis.yml and README.md in
> >> core-master.
> >>
> >> I cloned a fresh copy (MacOSX) and git status shows changes:
> >>
> >> On branch master
> >> Your branch is up-to-date with 'origin/master'.
> >> Changes not staged for commit:
> >>   (use "git add <file>..." to update what will be committed)
> >>   (use "git checkout -- <file>..." to discard changes in working
> directory)
> >>
> >>     modified:   .travis.yml
> >>     modified:   README.md
> >>
> >> I'm not a git guru so have no idea how to fix this so it also works in
> >> Windows.
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
> >> For additional commands, e-mail: dev-help@hc.apache.org
> >>
> >>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
> For additional commands, e-mail: dev-help@hc.apache.org
>
>

Re: Git core repos: issues with EOLs

Posted by sebb <se...@gmail.com>.
On 29 June 2017 at 20:13, Gary Gregory <ga...@gmail.com> wrote:
> Try
>
> git config --global core.autocrlf input
>
> Then clone.

I already have that set.

Note that I cloned several of the HC repos and they exhibit different behaviour.

I don't have the same issue with the -client repos

> Gary
>
> On Jun 29, 2017 12:09 PM, "sebb" <se...@gmail.com> wrote:
>
>> There seem to be some EOL issues with .travis.yml and README.md in
>> core-master.
>>
>> I cloned a fresh copy (MacOSX) and git status shows changes:
>>
>> On branch master
>> Your branch is up-to-date with 'origin/master'.
>> Changes not staged for commit:
>>   (use "git add <file>..." to update what will be committed)
>>   (use "git checkout -- <file>..." to discard changes in working directory)
>>
>>     modified:   .travis.yml
>>     modified:   README.md
>>
>> I'm not a git guru so have no idea how to fix this so it also works in
>> Windows.
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
>> For additional commands, e-mail: dev-help@hc.apache.org
>>
>>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
For additional commands, e-mail: dev-help@hc.apache.org


Re: Git core repos: issues with EOLs

Posted by Gary Gregory <ga...@gmail.com>.
Try

git config --global core.autocrlf input

Then clone.

Gary

On Jun 29, 2017 12:09 PM, "sebb" <se...@gmail.com> wrote:

> There seem to be some EOL issues with .travis.yml and README.md in
> core-master.
>
> I cloned a fresh copy (MacOSX) and git status shows changes:
>
> On branch master
> Your branch is up-to-date with 'origin/master'.
> Changes not staged for commit:
>   (use "git add <file>..." to update what will be committed)
>   (use "git checkout -- <file>..." to discard changes in working directory)
>
>     modified:   .travis.yml
>     modified:   README.md
>
> I'm not a git guru so have no idea how to fix this so it also works in
> Windows.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
> For additional commands, e-mail: dev-help@hc.apache.org
>
>