git status keeps saying modified: build/pkgs/cunningham_tables/main.gz

[Sébastien Labbé]

Dear sage-devel,

When I update my sage version, I never do a fresh clone. I always pull the most recent develop branch. Everything always work.

But now, my git status keeps telling me that build/pkgs/cunningham_tables/main.gz is modified and I found no way to get rid of that (git checkout build/pkgs/cunningham_tables/main.gz) does not work. I also try to commit the changes to a fake branch, but when I come back to develop, it is still there. I also tried git stash. Nothing works. That ghost thing is still there.

Is build/pkgs/cunningham_tables/main.gz suppose to be in the git tree?

Sébastien

$ git status

Sur la branche develop
Votre branche est en avance sur 'github/develop' de 1 commit.
  (utilisez "git push" pour publier vos commits locaux)
Modifications qui ne seront pas validées :
  (utilisez "git add <fichier>..." pour mettre à jour ce qui sera validé)
  (utilisez "git checkout -- <fichier>..." pour annuler les modifications dans la copie de travail)

    modifié :         build/pkgs/cunningham_tables/main.gz

aucune modification n'a été ajoutée à la validation (utilisez "git add" ou "git commit -a")

[Dima Pasechnik]

On Thu, Jul 30, 2020 at 8:37 AM Sébastien Labbé <sla...@gmail.com> wrote:
>
> Dear sage-devel,
>
> When I update my sage version, I never do a fresh clone. I always pull the most recent develop branch. Everything always work.
>
> But now, my git status keeps telling me that build/pkgs/cunningham_tables/main.gz is modified and I found no way to get rid of that (git checkout build/pkgs/cunningham_tables/main.gz) does not work. I also try to commit the changes to a fake branch, but when I come back to develop, it is still there. I also tried git stash. Nothing works. That ghost thing is still there.
>
> Is build/pkgs/cunningham_tables/main.gz suppose to be in the git tree?

there is nothing wrong with having binary files in git tree.
I can't reproduce what you describe.

There is something funny with your git settings (old git?).
A special setup in .gitattributes to try doing diffs on binary files?

>
> Sébastien
>
> $ git status
> Sur la branche develop
> Votre branche est en avance sur 'github/develop' de 1 commit.
> (utilisez "git push" pour publier vos commits locaux)
> Modifications qui ne seront pas validées :
> (utilisez "git add <fichier>..." pour mettre à jour ce qui sera validé)
> (utilisez "git checkout -- <fichier>..." pour annuler les modifications dans la copie de travail)
>
> modifié : build/pkgs/cunningham_tables/main.gz
>
> aucune modification n'a été ajoutée à la validation (utilisez "git add" ou "git commit -a")
>

> --
> You received this message because you are subscribed to the Google Groups "sage-devel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+...@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/sage-devel/ae4a89ba-aed9-4396-82a1-23b906e0e85bo%40googlegroups.com.

[Sébastien Labbé]

On Thursday, July 30, 2020 at 10:12:10 AM UTC+2, Dima Pasechnik wrote:

On Thu, Jul 30, 2020 at 8:37 AM Sébastien Labbé <sla...@gmail.com> wrote:
>
> Dear sage-devel,
>
> When I update my sage version, I never do a fresh clone. I always pull the most recent develop branch. Everything always work.
>
> But now, my git status keeps telling me that build/pkgs/cunningham_tables/main.gz is modified and I found no way to get rid of that (git checkout build/pkgs/cunningham_tables/main.gz) does not work. I also try to commit the changes to a fake branch, but when I come back to develop, it is still there. I also tried git stash. Nothing works. That ghost thing is still there.
>
> Is build/pkgs/cunningham_tables/main.gz suppose to be in the git tree?

there is nothing wrong with having binary files in git tree.
I can't reproduce what you describe.

There is something funny with your git settings (old git?).

maybe

 $ git --version
git version 2.7.4

 

A special setup in .gitattributes to try doing diffs on binary files?

I have never touched that :

 $ cd SAGE_ROOT

 $ cat .gitattributes
# Force LF normalization
* text=auto eol=lf
# except for Windows batch files
*.{cmd,[cC][mM][dD]} text eol=crlf
*.{bat,[bB][aA][tT]} text eol=crlf

[Dima Pasechnik]

On Thu, Jul 30, 2020 at 9:31 AM Sébastien Labbé <sla...@gmail.com> wrote:
>
>
>
> On Thursday, July 30, 2020 at 10:12:10 AM UTC+2, Dima Pasechnik wrote:
>>
>> On Thu, Jul 30, 2020 at 8:37 AM Sébastien Labbé <sla...@gmail.com> wrote:
>> >
>> > Dear sage-devel,
>> >
>> > When I update my sage version, I never do a fresh clone. I always pull the most recent develop branch. Everything always work.
>> >
>> > But now, my git status keeps telling me that build/pkgs/cunningham_tables/main.gz is modified and I found no way to get rid of that (git checkout build/pkgs/cunningham_tables/main.gz) does not work. I also try to commit the changes to a fake branch, but when I come back to develop, it is still there. I also tried git stash. Nothing works. That ghost thing is still there.
>> >
>> > Is build/pkgs/cunningham_tables/main.gz suppose to be in the git tree?
>>
>> there is nothing wrong with having binary files in git tree.
>> I can't reproduce what you describe.
>>
>> There is something funny with your git settings (old git?).
>
>
> maybe
>
> $ git --version
> git version 2.7.4

vintage!

Debian stable (buster, aka 10) has
$ git --version
git version 2.20.1

>
>>
>> A special setup in .gitattributes to try doing diffs on binary files?
>
>
> I have never touched that :
>
> $ cd SAGE_ROOT
> $ cat .gitattributes
> # Force LF normalization
> * text=auto eol=lf
> # except for Windows batch files
> *.{cmd,[cC][mM][dD]} text eol=crlf
> *.{bat,[bB][aA][tT]} text eol=crlf
>

> --
> You received this message because you are subscribed to the Google Groups "sage-devel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+...@googlegroups.com.

> To view this discussion on the web visit https://groups.google.com/d/msgid/sage-devel/5adab0c6-e825-4132-b3f4-21a7a7fe8374o%40googlegroups.com.