Re: [sage-devel] Can't pull from develop branch.

2018-10-01 Thread Emmanuel Charpentier
Well... on a machine that was stille at 8.4.beta4, I stumble on the same point : charpent@p-202-021:/usr/local/sage-8$ git pull error: cannot lock ref 'refs/remotes/origin/u/embray/python3/sage-rings-polynomial-polydict/misc': 'refs/remotes/origin/u/embray/python3/sage-rings-polynomial-polydict

Re: [sage-devel] Can't pull from develop branch.

2018-09-28 Thread Erik Bray
Yes, I think you're right. I deleted the problematic branch from that repository and restarted the mirroring so we'll see. GitLab even reported "Invalid reference name" as the relevant error. Well, hopefully I won't make that mistake again! On Fri, Sep 28, 2018 at 2:49 PM Dima Pasechnik wrote:

Re: [sage-devel] Can't pull from develop branch.

2018-09-28 Thread Dima Pasechnik
By the way, I would not be surprised if the mirror https://gitlab.com/sagemath/dev/trac failed to update due to the same problem on git.sagemath.org Read-only mirror of all the branches that are on trac.sagemath.org Project ID: 6249490 Mirrored from git://git.sagemath.org/sage.git. The reposito

Re: [sage-devel] Can't pull from develop branch.

2018-09-24 Thread Erik Bray
On Sat, Sep 22, 2018 at 10:30 PM Emmanuel Charpentier wrote: > Le samedi 22 septembre 2018 22:19:32 UTC+2, Erik Bray a écrit : >> >> Try >> >> $ git branch -d origin/u/embray/python3/sage-rings-polynomial-polydict > > > No such luck : > > charpent@asus16-ec:/usr/local/sage-8$ git branch -d > orig

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Emmanuel Charpentier
Dear Volker, Le dimanche 23 septembre 2018 00:28:42 UTC+2, Volker Braun a écrit : > > Try "git remote prune origin" or "git remote update origin --prune" > Thanks ! this did it. > > Explanation: You only have a stale remote reference reference, this is > slightly different from Dima's problem

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Volker Braun
Try "git remote prune origin" or "git remote update origin --prune" Explanation: You only have a stale remote reference reference, this is slightly different from Dima's problem who had the branch locally checked out. The "git branch -d" only deletes local branches. You need to prune the cached

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Emmanuel Charpentier
Le samedi 22 septembre 2018 22:19:32 UTC+2, Erik Bray a écrit : > > Try > > $ git branch -d origin/u/embray/python3/sage-rings-polynomial-polydict > No such luck : charpent@asus16-ec:/usr/local/sage-8$ git branch -d origin/u/embray/python3/sage-rings-polynomial-polydict error: branche 'origin/

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Erik Bray
Try $ git branch -d origin/u/embray/python3/sage-rings-polynomial-polydict You wouldn't have the above branch without "origin" unless you created a remote tracking branch. It's only remote branches which you're having a problem with (note: this happened because I had an older branch named u/embr

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Emmanuel Charpentier
It doesn't seem to have hurt. But it doesn't seem to have helped either : now I have two problematic branches : charpent@asus16-ec:/usr/local/sage-8$ git pull remote: Counting objects: 99, done. remote: Compressing objects: 100% (40/40), done. remote: Total 40 (delta 29), reused 0 (delta 0) Dépaq

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Dima Pasechnik
I don't see why `git gc` would hurt it. On Sat, 22 Sep 2018, 20:24 Emmanuel Charpentier, < emanuel.charpent...@gmail.com> wrote: > Okay. But this means I have to wait for this pruning... > > Unless you tell me it's a bad idea (and why), I'll try to git gc > --agressive. At worst, Ill have to retr

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Emmanuel Charpentier
Okay. But this means I have to wait for this pruning... Unless you tell me it's a bad idea (and why), I'll try to git gc --agressive. At worst, Ill have to retry from a fresh clone... Le samedi 22 septembre 2018 21:19:59 UTC+2, Dima Pasechnik a écrit : > > IMHO it's the main tree that might use

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Dima Pasechnik
IMHO it's the main tree that might use some pruning, as we now see the second case of it being uncooperative On Sat, 22 Sep 2018, 19:55 Emmanuel Charpentier, < emanuel.charpent...@gmail.com> wrote: > Should I try git gc (or possibly git gc aggressive) ? > Wouldn't this make my tree potentiall

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Emmanuel Charpentier
Should I try git gc (or possibly git gc aggressive) ? Wouldn't this make my tree potentially unfit to future pushes ? Le samedi 22 septembre 2018 20:27:08 UTC+2, Emmanuel Charpentier a écrit : [ Snip... ] -- You received this message because you are subscribed to the Google Groups "sage-devel

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Emmanuel Charpentier
Le samedi 22 septembre 2018 20:35:23 UTC+2, Dima Pasechnik a écrit : > > And, by the way, what is the remote you are pulling from? > >From my .git/config file : [remote "origin"] url = g...@git.sagemath.org:sage.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remo

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Emmanuel Charpentier
Le samedi 22 septembre 2018 20:33:23 UTC+2, Dima Pasechnik a écrit : > > On Sat, Sep 22, 2018 at 7:27 PM Emmanuel Charpentier > > wrote: > > > > Thanks, Dimitri ! > > > > But I'm not out of the woods : I do not know how to delete this branch. > Git tells me it doesn't know about it : > >

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Dima Pasechnik
And, by the way, what is the remote you are pulling from? On Sat, Sep 22, 2018 at 7:33 PM Dima Pasechnik wrote: > > On Sat, Sep 22, 2018 at 7:27 PM Emmanuel Charpentier > wrote: > > > > Thanks, Dimitri ! > > > > But I'm not out of the woods : I do not know how to delete this branch. Git > > tell

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Dima Pasechnik
On Sat, Sep 22, 2018 at 7:27 PM Emmanuel Charpentier wrote: > > Thanks, Dimitri ! > > But I'm not out of the woods : I do not know how to delete this branch. Git > tells me it doesn't know about it : > > charpent@asus16-ec:/usr/local/sage-8$ git branch -d > u/embray/python3/sage-rings-polynomial

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Emmanuel Charpentier
Thanks, Dimitri ! But I'm not out of the woods : I do not know how to delete this branch. Git tells me it doesn't know about it : charpent@asus16-ec:/usr/local/sage-8$ git branch -d u/embray/python3/sage-rings-polynomial-polydict error: branche 'u/embray/python3/sage-rings-polynomial-polydict'

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Dima Pasechnik
On Sat, Sep 22, 2018 at 7:10 PM Dima Pasechnik wrote: > > You are not the one hit by this particular branch of our vast git tree. See "the one" -> "the only one" > https://trac.sagemath.org/ticket/24762#comment:15 > and the following comments. > > > > On Sat, 22 Sep 2018, 18:53 Emmanuel Charpent

Re: [sage-devel] Can't pull from develop branch.

2018-09-22 Thread Dima Pasechnik
You are not the one hit by this particular branch of our vast git tree. See https://trac.sagemath.org/ticket/24762#comment:15 and the following comments. On Sat, 22 Sep 2018, 18:53 Emmanuel Charpentier, < emanuel.charpent...@gmail.com> wrote: > I wanted to update my (current) sage 8.4-beta4 to