Re: Urgent: git problem
On Wed, 23 Oct 2019, Simon Peyton Jones via ghc-devs wrote: Aieee! All my GHC repos are failing with this. As a result I can’t pull. What should I do? Thanks! git remote prune origin___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
RE: Urgent: git problem
Thanks everyone! From: ghc-devs On Behalf Of Bryan Richter Sent: 23 October 2019 17:36 To: GHC developers Subject: Re: Urgent: git problem I suspect a git fetch --prune might help. It looks like git's mapping of remote branches to a directory tree has caused a conflict between new and stale branches: ../rae/... can't be a directory if it's already a file! If that still doesn't work (if it tries to record new branches before deleting stale ones), you'd have to muck around in .git/refs/remotes and remove the files manually. On Wed, 23 Oct 2019, 18.29 Simon Peyton Jones via ghc-devs, mailto:ghc-devs@haskell.org>> wrote: a completely fresh clone seems ok. but that’s a bit brutal From: ghc-devs mailto:ghc-devs-boun...@haskell.org>> On Behalf Of Simon Peyton Jones via ghc-devs Sent: 23 October 2019 17:22 To: ghc-devs mailto:ghc-devs@haskell.org>> Subject: Urgent: git problem Aieee! All my GHC repos are failing with this. As a result I can’t pull. What should I do? Thanks! Simon git pull error: cannot lock ref 'refs/remotes/origin/wip/rae/remove-tc-dep': 'refs/remotes/origin/wip/rae' exists; cannot create 'refs/remotes/origin/wip/rae/remove-tc-dep' From gitlab.haskell.org:ghc/ghc ! [new branch]wip/rae/remove-tc-dep-> origin/wip/rae/remove-tc-dep (unable to update local ref) error: cannot lock ref 'refs/remotes/origin/wip/rae/split-up-modules': 'refs/remotes/origin/wip/rae' exists; cannot create 'refs/remotes/origin/wip/rae/split-up-modules' ! [new branch]wip/rae/split-up-modules -> origin/wip/rae/split-up-modules (unable to update local ref) simonpj@MSRC-3645512:~/code/HEAD-2$ ___ ghc-devs mailing list ghc-devs@haskell.org<mailto:ghc-devs@haskell.org> http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Re: Urgent: git problem
Ah, good to know there's a command *just* for pruning! I'd only ever seen the --prune flag to fetch/pull. On Wed, 23 Oct 2019, 18.30 Oliver Charles, wrote: > I usually encounter this when there has once been a branch called > "wip/rae" (so .git would have a *file* wip/rae), but now there's a > branch called "wip/rae/remove-tc-dep", so "wip/rae" should be a > directory, but it's already in .git as a file! I think "git remote > prune" fixes this, but I can't entirely recall. > > On Wed, Oct 23, 2019 at 5:22 PM Simon Peyton Jones via ghc-devs > wrote: > > > > Aieee! All my GHC repos are failing with this. As a result I can’t > pull. What should I do? Thanks! > > > > Simon > > > > > > > > git pull > > > > error: cannot lock ref 'refs/remotes/origin/wip/rae/remove-tc-dep': > 'refs/remotes/origin/wip/rae' exists; cannot create > 'refs/remotes/origin/wip/rae/remove-tc-dep' > > > > From gitlab.haskell.org:ghc/ghc > > > > ! [new branch]wip/rae/remove-tc-dep-> > origin/wip/rae/remove-tc-dep (unable to update local ref) > > > > error: cannot lock ref 'refs/remotes/origin/wip/rae/split-up-modules': > 'refs/remotes/origin/wip/rae' exists; cannot create > 'refs/remotes/origin/wip/rae/split-up-modules' > > > > ! [new branch]wip/rae/split-up-modules -> > origin/wip/rae/split-up-modules (unable to update local ref) > > > > simonpj@MSRC-3645512:~/code/HEAD-2$ > > > > ___ > > ghc-devs mailing list > > ghc-devs@haskell.org > > http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs > ___ > ghc-devs mailing list > ghc-devs@haskell.org > http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs > ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Re: Urgent: git problem
I suspect a git fetch --prune might help. It looks like git's mapping of remote branches to a directory tree has caused a conflict between new and stale branches: ../rae/... can't be a directory if it's already a file! If that still doesn't work (if it tries to record new branches before deleting stale ones), you'd have to muck around in .git/refs/remotes and remove the files manually. On Wed, 23 Oct 2019, 18.29 Simon Peyton Jones via ghc-devs, < ghc-devs@haskell.org> wrote: > a completely fresh clone seems ok. but that’s a bit brutal > > > > *From:* ghc-devs *On Behalf Of *Simon > Peyton Jones via ghc-devs > *Sent:* 23 October 2019 17:22 > *To:* ghc-devs > *Subject:* Urgent: git problem > > > > Aieee! All my GHC repos are failing with this. As a result I can’t > pull. What should I do? Thanks! > > Simon > > > > git pull > > error: cannot lock ref 'refs/remotes/origin/wip/rae/remove-tc-dep': > 'refs/remotes/origin/wip/rae' > exists; cannot create 'refs/remotes/origin/wip/rae/remove-tc-dep' > > From gitlab.haskell.org:ghc/ghc > > ! [new branch]wip/rae/remove-tc-dep-> > origin/wip/rae/remove-tc-dep (unable to update local ref) > > error: cannot lock ref 'refs/remotes/origin/wip/rae/split-up-modules': > 'refs/remotes/origin/wip/rae' exists; cannot create > 'refs/remotes/origin/wip/rae/split-up-modules' > > ! [new branch]wip/rae/split-up-modules -> > origin/wip/rae/split-up-modules (unable to update local ref) > > simonpj@MSRC-3645512:~/code/HEAD-2$ > ___ > ghc-devs mailing list > ghc-devs@haskell.org > http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs > ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
RE: Urgent: git problem
Thanks. Yes 'git remote prune origin' did the trick! Simon | -Original Message- | From: Oliver Charles | Sent: 23 October 2019 17:30 | To: Simon Peyton Jones | Cc: ghc-devs | Subject: Re: Urgent: git problem | | I usually encounter this when there has once been a branch called | "wip/rae" (so .git would have a *file* wip/rae), but now there's a | branch called "wip/rae/remove-tc-dep", so "wip/rae" should be a | directory, but it's already in .git as a file! I think "git remote | prune" fixes this, but I can't entirely recall. | | On Wed, Oct 23, 2019 at 5:22 PM Simon Peyton Jones via ghc-devs | wrote: | > | > Aieee! All my GHC repos are failing with this. As a result I can’t | pull. What should I do? Thanks! | > | > Simon | > | > | > | > git pull | > | > error: cannot lock ref 'refs/remotes/origin/wip/rae/remove-tc-dep': | 'refs/remotes/origin/wip/rae' exists; cannot create | 'refs/remotes/origin/wip/rae/remove-tc-dep' | > | > From gitlab.haskell.org:ghc/ghc | > | > ! [new branch]wip/rae/remove-tc-dep-> | origin/wip/rae/remove-tc-dep (unable to update local ref) | > | > error: cannot lock ref 'refs/remotes/origin/wip/rae/split-up-modules': | 'refs/remotes/origin/wip/rae' exists; cannot create | 'refs/remotes/origin/wip/rae/split-up-modules' | > | > ! [new branch]wip/rae/split-up-modules -> | origin/wip/rae/split-up-modules (unable to update local ref) | > | > simonpj@MSRC-3645512:~/code/HEAD-2$ | > | > ___ | > ghc-devs mailing list | > ghc-devs@haskell.org | > | https://nam06.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.hask | ell.org%2Fcgi-bin%2Fmailman%2Flistinfo%2Fghc- | devs&data=02%7C01%7Csimonpj%40microsoft.com%7Ca21353034c8540fe2e1208d7 | 57d644a6%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637074450093374131&a | mp;sdata=jMgjQRgGI93G4HbZPhfnmEEOyRcgK%2BBOhdcQYmH2m1M%3D&reserved=0 ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Re: Urgent: git problem
I do git pull origin master And it then works Alan On Wed, 23 Oct 2019, 17:29 Simon Peyton Jones via ghc-devs, < ghc-devs@haskell.org> wrote: > a completely fresh clone seems ok. but that’s a bit brutal > > > > *From:* ghc-devs *On Behalf Of *Simon > Peyton Jones via ghc-devs > *Sent:* 23 October 2019 17:22 > *To:* ghc-devs > *Subject:* Urgent: git problem > > > > Aieee! All my GHC repos are failing with this. As a result I can’t > pull. What should I do? Thanks! > > Simon > > > > git pull > > error: cannot lock ref 'refs/remotes/origin/wip/rae/remove-tc-dep': > 'refs/remotes/origin/wip/rae' > exists; cannot create 'refs/remotes/origin/wip/rae/remove-tc-dep' > > From gitlab.haskell.org:ghc/ghc > > ! [new branch]wip/rae/remove-tc-dep-> > origin/wip/rae/remove-tc-dep (unable to update local ref) > > error: cannot lock ref 'refs/remotes/origin/wip/rae/split-up-modules': > 'refs/remotes/origin/wip/rae' exists; cannot create > 'refs/remotes/origin/wip/rae/split-up-modules' > > ! [new branch]wip/rae/split-up-modules -> > origin/wip/rae/split-up-modules (unable to update local ref) > > simonpj@MSRC-3645512:~/code/HEAD-2$ > ___ > ghc-devs mailing list > ghc-devs@haskell.org > http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs > ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Re: Urgent: git problem
I usually encounter this when there has once been a branch called "wip/rae" (so .git would have a *file* wip/rae), but now there's a branch called "wip/rae/remove-tc-dep", so "wip/rae" should be a directory, but it's already in .git as a file! I think "git remote prune" fixes this, but I can't entirely recall. On Wed, Oct 23, 2019 at 5:22 PM Simon Peyton Jones via ghc-devs wrote: > > Aieee! All my GHC repos are failing with this. As a result I can’t pull. > What should I do? Thanks! > > Simon > > > > git pull > > error: cannot lock ref 'refs/remotes/origin/wip/rae/remove-tc-dep': > 'refs/remotes/origin/wip/rae' exists; cannot create > 'refs/remotes/origin/wip/rae/remove-tc-dep' > > From gitlab.haskell.org:ghc/ghc > > ! [new branch]wip/rae/remove-tc-dep-> > origin/wip/rae/remove-tc-dep (unable to update local ref) > > error: cannot lock ref 'refs/remotes/origin/wip/rae/split-up-modules': > 'refs/remotes/origin/wip/rae' exists; cannot create > 'refs/remotes/origin/wip/rae/split-up-modules' > > ! [new branch]wip/rae/split-up-modules -> > origin/wip/rae/split-up-modules (unable to update local ref) > > simonpj@MSRC-3645512:~/code/HEAD-2$ > > ___ > ghc-devs mailing list > ghc-devs@haskell.org > http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Re: Urgent: git problem
Hi, Some googling turned up this SO thread https://stackoverflow.com/a/43253320/388010 Does that help? Cheers Sebastian Am Mi., 23. Okt. 2019 um 17:22 Uhr schrieb Simon Peyton Jones via ghc-devs < ghc-devs@haskell.org>: > Aieee! All my GHC repos are failing with this. As a result I can’t > pull. What should I do? Thanks! > > Simon > > > > git pull > > error: cannot lock ref 'refs/remotes/origin/wip/rae/remove-tc-dep': > 'refs/remotes/origin/wip/rae' > exists; cannot create 'refs/remotes/origin/wip/rae/remove-tc-dep' > > From gitlab.haskell.org:ghc/ghc > > ! [new branch]wip/rae/remove-tc-dep-> > origin/wip/rae/remove-tc-dep (unable to update local ref) > > error: cannot lock ref 'refs/remotes/origin/wip/rae/split-up-modules': > 'refs/remotes/origin/wip/rae' exists; cannot create > 'refs/remotes/origin/wip/rae/split-up-modules' > > ! [new branch]wip/rae/split-up-modules -> > origin/wip/rae/split-up-modules (unable to update local ref) > > simonpj@MSRC-3645512:~/code/HEAD-2$ > ___ > ghc-devs mailing list > ghc-devs@haskell.org > http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs > ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
RE: Urgent: git problem
a completely fresh clone seems ok. but that's a bit brutal From: ghc-devs On Behalf Of Simon Peyton Jones via ghc-devs Sent: 23 October 2019 17:22 To: ghc-devs Subject: Urgent: git problem Aieee! All my GHC repos are failing with this. As a result I can't pull. What should I do? Thanks! Simon git pull error: cannot lock ref 'refs/remotes/origin/wip/rae/remove-tc-dep': 'refs/remotes/origin/wip/rae' exists; cannot create 'refs/remotes/origin/wip/rae/remove-tc-dep' >From gitlab.haskell.org:ghc/ghc ! [new branch]wip/rae/remove-tc-dep-> origin/wip/rae/remove-tc-dep (unable to update local ref) error: cannot lock ref 'refs/remotes/origin/wip/rae/split-up-modules': 'refs/remotes/origin/wip/rae' exists; cannot create 'refs/remotes/origin/wip/rae/split-up-modules' ! [new branch]wip/rae/split-up-modules -> origin/wip/rae/split-up-modules (unable to update local ref) simonpj@MSRC-3645512:~/code/HEAD-2$ ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Urgent: git problem
Aieee! All my GHC repos are failing with this. As a result I can't pull. What should I do? Thanks! Simon git pull error: cannot lock ref 'refs/remotes/origin/wip/rae/remove-tc-dep': 'refs/remotes/origin/wip/rae' exists; cannot create 'refs/remotes/origin/wip/rae/remove-tc-dep' >From gitlab.haskell.org:ghc/ghc ! [new branch]wip/rae/remove-tc-dep-> origin/wip/rae/remove-tc-dep (unable to update local ref) error: cannot lock ref 'refs/remotes/origin/wip/rae/split-up-modules': 'refs/remotes/origin/wip/rae' exists; cannot create 'refs/remotes/origin/wip/rae/split-up-modules' ! [new branch]wip/rae/split-up-modules -> origin/wip/rae/split-up-modules (unable to update local ref) simonpj@MSRC-3645512:~/code/HEAD-2$ ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
