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

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-bounces@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.orgmailto:ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs

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