issue fetching master repo

[Boris Tyukin <bo...@boristyukin.com>]

hey guys,

want to submit my first tiny PR and once I fork airflow and clone my repo
get this message below:

I cannot commit / rebase and I cannot find a way to remove this file. Is it
only my who has this issue?

git status
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working
directory)
#
# modified:   airflow/www/static/nv.d3.js

Re: issue fetching master repo

[Boris Tyukin <bo...@boristyukin.com>]

thanks Gael, this was it! man I spent 3 hours trying to figure this out!

my .gitconfig has core.autocrlf=input as it is recommended by github (the
article you references) and by git documentation. Apparently this was
causing issues with airflow repo and specifically this file (which I did
not change)

 airflow/www/static/nv.d3.js

This file has mixed line ending (both linux and windows style) and my git
was correcting this when i cloned the repo.

I wonder why other people do not have the same issue especially
because core.autocrlf=input
is a way to go normally.

Should we fix that file? Or maybe add .gitattributes file to airflow repo
as github suggesting?



On Thu, Apr 20, 2017 at 7:57 AM, Gael Magnan <ga...@gmail.com> wrote:

> It's probably due to your git settings having to do with line end.
> The file has mixed line end, if you git is setup to change the line end at
> pull (core.autocrlf)
> You might experience that. I suggest reading article about the subject
> like: https://help.github.com/articles/dealing-with-line-endings/
> Hope this helps.
>
> Regards
> Gael
>
> Le jeu. 20 avr. 2017 à 13:44, Bolke de Bruin <bd...@gmail.com> a écrit :
>
> > Hi Boris,
> >
> > To be honest this is not an airflow question, but a git question.
> >
> > If you havent made any changes to the code, why don’t you delete the test
> > folder and cone again?
> >
> > B.
> >
> > > On 20 Apr 2017, at 13:42, Boris Tyukin <bo...@boristyukin.com> wrote:
> > >
> > > I just did this
> > >
> > > $ git clone git@github.com:apache/incubator-airflow.git test
> > > $ cd test
> > > $ git status
> > >
> > > and getting this right away -
> > > # On branch master
> > > # Changed but not updated:
> > > #   (use "git add <file>..." to update what will be committed)
> > > #   (use "git checkout -- <file>..." to discard changes in working
> > > directory)
> > > #
> > > # modified:   airflow/www/static/nv.d3.js
> > >
> > > but I did not touch that file. I cannot do rebase or commit:
> > >
> > > cannot rebase: you have unstaged changes
> > > D airflow/www/static/nv.d3.js
> > >
> > >
> > > This is really weird, please help
> > >
> > >
> > >
> > >
> > > On Wed, Apr 19, 2017 at 11:19 PM, Boris Tyukin <bo...@boristyukin.com>
> > > wrote:
> > >
> > >> hey guys,
> > >>
> > >> want to submit my first tiny PR and once I fork airflow and clone my
> > repo
> > >> get this message below:
> > >>
> > >> I cannot commit / rebase and I cannot find a way to remove this file.
> Is
> > >> it only my who has this issue?
> > >>
> > >> git status
> > >> # On branch master
> > >> # Changed but not updated:
> > >> #   (use "git add <file>..." to update what will be committed)
> > >> #   (use "git checkout -- <file>..." to discard changes in working
> > >> directory)
> > >> #
> > >> # modified:   airflow/www/static/nv.d3.js
> > >>
> > >>
> >
> >
>

Re: issue fetching master repo

[Gael Magnan <ga...@gmail.com>]

It's probably due to your git settings having to do with line end.
The file has mixed line end, if you git is setup to change the line end at
pull (core.autocrlf)
You might experience that. I suggest reading article about the subject
like: https://help.github.com/articles/dealing-with-line-endings/
Hope this helps.

Regards
Gael

Le jeu. 20 avr. 2017 à 13:44, Bolke de Bruin <bd...@gmail.com> a écrit :

> Hi Boris,
>
> To be honest this is not an airflow question, but a git question.
>
> If you havent made any changes to the code, why don’t you delete the test
> folder and cone again?
>
> B.
>
> > On 20 Apr 2017, at 13:42, Boris Tyukin <bo...@boristyukin.com> wrote:
> >
> > I just did this
> >
> > $ git clone git@github.com:apache/incubator-airflow.git test
> > $ cd test
> > $ git status
> >
> > and getting this right away -
> > # On branch master
> > # Changed but not updated:
> > #   (use "git add <file>..." to update what will be committed)
> > #   (use "git checkout -- <file>..." to discard changes in working
> > directory)
> > #
> > # modified:   airflow/www/static/nv.d3.js
> >
> > but I did not touch that file. I cannot do rebase or commit:
> >
> > cannot rebase: you have unstaged changes
> > D airflow/www/static/nv.d3.js
> >
> >
> > This is really weird, please help
> >
> >
> >
> >
> > On Wed, Apr 19, 2017 at 11:19 PM, Boris Tyukin <bo...@boristyukin.com>
> > wrote:
> >
> >> hey guys,
> >>
> >> want to submit my first tiny PR and once I fork airflow and clone my
> repo
> >> get this message below:
> >>
> >> I cannot commit / rebase and I cannot find a way to remove this file. Is
> >> it only my who has this issue?
> >>
> >> git status
> >> # On branch master
> >> # Changed but not updated:
> >> #   (use "git add <file>..." to update what will be committed)
> >> #   (use "git checkout -- <file>..." to discard changes in working
> >> directory)
> >> #
> >> # modified:   airflow/www/static/nv.d3.js
> >>
> >>
>
>

Re: issue fetching master repo

[Bolke de Bruin <bd...@gmail.com>]

Hi Boris,

To be honest this is not an airflow question, but a git question.

If you havent made any changes to the code, why don’t you delete the test folder and cone again?

B.

> On 20 Apr 2017, at 13:42, Boris Tyukin <bo...@boristyukin.com> wrote:
> 
> I just did this
> 
> $ git clone git@github.com:apache/incubator-airflow.git test
> $ cd test
> $ git status
> 
> and getting this right away -
> # On branch master
> # Changed but not updated:
> #   (use "git add <file>..." to update what will be committed)
> #   (use "git checkout -- <file>..." to discard changes in working
> directory)
> #
> # modified:   airflow/www/static/nv.d3.js
> 
> but I did not touch that file. I cannot do rebase or commit:
> 
> cannot rebase: you have unstaged changes
> D airflow/www/static/nv.d3.js
> 
> 
> This is really weird, please help
> 
> 
> 
> 
> On Wed, Apr 19, 2017 at 11:19 PM, Boris Tyukin <bo...@boristyukin.com>
> wrote:
> 
>> hey guys,
>> 
>> want to submit my first tiny PR and once I fork airflow and clone my repo
>> get this message below:
>> 
>> I cannot commit / rebase and I cannot find a way to remove this file. Is
>> it only my who has this issue?
>> 
>> git status
>> # On branch master
>> # Changed but not updated:
>> #   (use "git add <file>..." to update what will be committed)
>> #   (use "git checkout -- <file>..." to discard changes in working
>> directory)
>> #
>> # modified:   airflow/www/static/nv.d3.js
>> 
>> 

Re: issue fetching master repo

[Boris Tyukin <bo...@boristyukin.com>]

I just did this

$ git clone git@github.com:apache/incubator-airflow.git test
$ cd test
$ git status

and getting this right away -
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working
directory)
#
# modified:   airflow/www/static/nv.d3.js

but I did not touch that file. I cannot do rebase or commit:

cannot rebase: you have unstaged changes
D airflow/www/static/nv.d3.js


This is really weird, please help




On Wed, Apr 19, 2017 at 11:19 PM, Boris Tyukin <bo...@boristyukin.com>
wrote:

> hey guys,
>
> want to submit my first tiny PR and once I fork airflow and clone my repo
> get this message below:
>
> I cannot commit / rebase and I cannot find a way to remove this file. Is
> it only my who has this issue?
>
> git status
> # On branch master
> # Changed but not updated:
> #   (use "git add <file>..." to update what will be committed)
> #   (use "git checkout -- <file>..." to discard changes in working
> directory)
> #
> # modified:   airflow/www/static/nv.d3.js
>
>