Errors in haddock git fetch

2021-05-27 Thread Simon Peyton Jones via ghc-devs 
I'm getting these errors from `git submodule update`.  Should I worry?
Simon


>From https://gitlab.haskell.org/ghc/haddock

* [new branch]az/T19834 
   -> origin/az/T19834

* [new branch]az/T19834-2   
   -> origin/az/T19834-2

* [new branch]az/T19845 
   -> origin/az/T19845

* [new branch]az/T19845-2   
   -> origin/az/T19845-2

* [new branch]az/T19845-3   
   -> origin/az/T19845-3

* [new branch]
dependabot/npm_and_yarn/haddock-api/resources/html/hosted-git-info-2.8.9 -> 
origin/dependabot/npm_and_yarn/haddock-api/resources/html/hosted-git-info-2.8.9

* [new branch]
dependabot/npm_and_yarn/haddock-api/resources/html/lodash-4.17.21-> 
origin/dependabot/npm_and_yarn/haddock-api/resources/html/lodash-4.17.21

* [new branch]dn/dn-driver-refactor-and-split   
   -> origin/dn/dn-driver-refactor-and-split

   b4e7407b..c7281407  ghc-9.2  
-> origin/ghc-9.2

   dabdee14..4f9088e4  ghc-head 
-> origin/ghc-head

* [new branch]wip/T18389-task-zero  
   -> origin/wip/T18389-task-zero

+ 7d27ea7a...3b6a8774 wip/T19720
   -> origin/wip/T19720  (forced update)

+ fe35fed3...40ba457f wip/adinapoli-align-ps-messages   
   -> origin/wip/adinapoli-align-ps-messages  (forced update)

* [new branch]wip/dn-driver-refactor-and-split  
   -> origin/wip/dn-driver-refactor-and-split

error: cannot lock ref 'refs/remotes/origin/wip/hsyl20/dynflags': 
'refs/remotes/origin/wip/hsyl20/dynflags/exception' exists; cannot create 
'refs/remotes/origin/wip/hsyl20/dynflags'

! [new branch]wip/hsyl20/dynflags   
   -> origin/wip/hsyl20/dynflags  (unable to update local ref)

* [new branch]wip/hsyl20/uncpp  
   -> origin/wip/hsyl20/uncpp

Unable to fetch in submodule path 'utils/haddock'; trying to directly fetch 
4f9088e4b04e52ca510b55a78048c9230537e449:

Submodule path 'utils/haddock': checked out 
'4f9088e4b04e52ca510b55a78048c9230537e449'

simonpj@MSRC-3645512:~/code/HEAD-7$
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs

Re: Errors in haddock git fetch

2021-05-27 Thread Sylvain Henry 
error: cannot lock ref  'refs/remotes/origin/wip/hsyl20/dynflags': 
'refs/remotes/origin/wip/hsyl20/dynflags/exception' exists; cannot 
create 'refs/remotes/origin/wip/hsyl20/dynflags'


This one is because I've removed some of my wip branches already merged 
upstream. Their names were conflicting with a new branch name 
(wip/hsyl20/dynflags).


I forgot that everyone fetches every /wip branch so now it conflicts for 
everyone... I need to remember to remove the branch when !5845 will be 
merged.


> Should I worry?

No. The submodule seems to be checked out correctly even with the error.

Sylvain

PS: I still think we shouldn't have that many wip branches in the main 
repositories (cf 
https://mail.haskell.org/pipermail/ghc-devs/2019-February/017031.html)



On 27/05/2021 15:40, Simon Peyton Jones via ghc-devs wrote:


I’m getting these errors from `git submodule update`.  Should I worry?

Simon

From https://gitlab.haskell.org/ghc/haddock 



* [new branch] az/T19834 -> origin/az/T19834

* [new branch] az/T19834-2 -> origin/az/T19834-2

* [new branch] az/T19845 -> origin/az/T19845

* [new branch] az/T19845-2 -> origin/az/T19845-2

* [new branch] az/T19845-3 -> origin/az/T19845-3

* [new branch] 
dependabot/npm_and_yarn/haddock-api/resources/html/hosted-git-info-2.8.9 
-> 
origin/dependabot/npm_and_yarn/haddock-api/resources/html/hosted-git-info-2.8.9


* [new branch] 
dependabot/npm_and_yarn/haddock-api/resources/html/lodash-4.17.21 -> 
origin/dependabot/npm_and_yarn/haddock-api/resources/html/lodash-4.17.21


* [new branch] dn/dn-driver-refactor-and-split -> 
origin/dn/dn-driver-refactor-and-split


   b4e7407b..c7281407 ghc-9.2    -> origin/ghc-9.2

   dabdee14..4f9088e4 ghc-head -> origin/ghc-head

* [new branch] wip/T18389-task-zero -> origin/wip/T18389-task-zero

+ 7d27ea7a...3b6a8774 wip/T19720 -> origin/wip/T19720  (forced update)

+ fe35fed3...40ba457f wip/adinapoli-align-ps-messages  -> 
origin/wip/adinapoli-align-ps-messages  (forced update)


* [new branch] wip/dn-driver-refactor-and-split -> 
origin/wip/dn-driver-refactor-and-split


error: cannot lock ref 'refs/remotes/origin/wip/hsyl20/dynflags': 
'refs/remotes/origin/wip/hsyl20/dynflags/exception' exists; cannot 
create 'refs/remotes/origin/wip/hsyl20/dynflags'


! [new branch] wip/hsyl20/dynflags -> origin/wip/hsyl20/dynflags  
(unable to update local ref)


* [new branch] wip/hsyl20/uncpp -> origin/wip/hsyl20/uncpp

Unable to fetch in submodule path 'utils/haddock'; trying to directly 
fetch 4f9088e4b04e52ca510b55a78048c9230537e449:


Submodule path 'utils/haddock': checked out 
'4f9088e4b04e52ca510b55a78048c9230537e449'


simonpj@MSRC-3645512:~/code/HEAD-7$


___
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: Errors in haddock git fetch

2021-05-27 Thread Alan & Kim Zimmerman 
You can get rid of the errors by doing

git remote prune 

Where  is the name you have for the upstream repo, normally
'origin'.

Alan

On Thu, 27 May 2021 at 16:11, Sylvain Henry  wrote:

> > error: cannot lock ref 'refs/remotes/origin/wip/hsyl20/dynflags':
> 'refs/remotes/origin/wip/hsyl20/dynflags/exception' exists; cannot create
> 'refs/remotes/origin/wip/hsyl20/dynflags'
>
> This one is because I've removed some of my wip branches already merged
> upstream. Their names were conflicting with a new branch name
> (wip/hsyl20/dynflags).
>
> I forgot that everyone fetches every /wip branch so now it conflicts for
> everyone... I need to remember to remove the branch when !5845 will be
> merged.
>
> > Should I worry?
>
> No. The submodule seems to be checked out correctly even with the error.
>
> Sylvain
>
> PS: I still think we shouldn't have that many wip branches in the main
> repositories (cf
> https://mail.haskell.org/pipermail/ghc-devs/2019-February/017031.html)
>
>
> On 27/05/2021 15:40, Simon Peyton Jones via ghc-devs wrote:
>
> I’m getting these errors from `git submodule update`.  Should I worry?
>
> Simon
>
>
>
> From https://gitlab.haskell.org/ghc/haddock
>
> * [new branch]
> az/T19834->
> origin/az/T19834
>
> * [new branch]
> az/T19834-2  ->
> origin/az/T19834-2
>
> * [new branch]
> az/T19845->
> origin/az/T19845
>
> * [new branch]
> az/T19845-2  ->
> origin/az/T19845-2
>
> * [new branch]
> az/T19845-3  ->
> origin/az/T19845-3
>
> * [new branch]
> dependabot/npm_and_yarn/haddock-api/resources/html/hosted-git-info-2.8.9 ->
> origin/dependabot/npm_and_yarn/haddock-api/resources/html/hosted-git-info-2.8.9
>
> * [new branch]
> dependabot/npm_and_yarn/haddock-api/resources/html/lodash-4.17.21->
> origin/dependabot/npm_and_yarn/haddock-api/resources/html/lodash-4.17.21
>
> * [new branch]
> dn/dn-driver-refactor-and-split  ->
> origin/dn/dn-driver-refactor-and-split
>
>b4e7407b..c7281407  ghc-9.2
>-> origin/ghc-9.2
>
>dabdee14..4f9088e4
> ghc-head ->
> origin/ghc-head
>
> * [new branch]
> wip/T18389-task-zero ->
> origin/wip/T18389-task-zero
>
> + 7d27ea7a...3b6a8774
> wip/T19720   ->
> origin/wip/T19720  (forced update)
>
> + fe35fed3...40ba457f
> wip/adinapoli-align-ps-messages  ->
> origin/wip/adinapoli-align-ps-messages  (forced update)
>
> * [new branch]
> wip/dn-driver-refactor-and-split ->
> origin/wip/dn-driver-refactor-and-split
>
> error: cannot lock ref 'refs/remotes/origin/wip/hsyl20/dynflags':
> 'refs/remotes/origin/wip/hsyl20/dynflags/exception' exists; cannot create
> 'refs/remotes/origin/wip/hsyl20/dynflags'
>
> ! [new branch]
> wip/hsyl20/dynflags  ->
> origin/wip/hsyl20/dynflags  (unable to update local ref)
>
> * [new branch]
> wip/hsyl20/uncpp ->
> origin/wip/hsyl20/uncpp
>
> Unable to fetch in submodule path 'utils/haddock'; trying to directly
> fetch 4f9088e4b04e52ca510b55a78048c9230537e449:
>
> Submodule path 'utils/haddock': checked out
> '4f9088e4b04e52ca510b55a78048c9230537e449'
>
> simonpj@MSRC-3645512:~/code/HEAD-7$
>
> ___
> ghc-devs mailing 
> listghc-devs@haskell.orghttp://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