RE: Can't push to haddock repo

2015-10-26 Thread Ben Gamari
Simon Peyton Jones  writes:

> Well in utils/haddock/.git/config I see
> [remote "origin"]
>   url = git://git.haskell.org/haddock.git
>   pushurl = ssh://g...@git.haskell.org/haddock.git
>
Note the difference in hostnames,

   ssh://g...@git.haskell.org/haddock.git
 ssh://g...@github.com/haskell/haddock.git 

The point being, Haddock is hosted on Github. I believe the repo on
git.haskell.org is merely a mirror.

It's a bit hard to keep track of all of this at times, so the upstream
repositories are documented in the `packages` file at the root of the
GHC repository.

Cheers,

- Ben



signature.asc
Description: PGP signature
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs


Can't push to haddock repo

2015-10-26 Thread Simon Peyton Jones
I can't update the haddock repository!   (I want to add a new branch for my 
in-flight work.)
Can anyone help?
Thanks
Simon


git push --set-upstream origin wip/spj-wildcard-refactor

remote: W refs/heads/wip/spj-wildcard-refactor haddock simonpj DENIED by refs/.*

remote: error: hook declined to update refs/heads/wip/spj-wildcard-refactor

To ssh://g...@git.haskell.org/haddock.git

! [remote rejected] wip/spj-wildcard-refactor -> wip/spj-wildcard-refactor 
(hook declined)

error: failed to push some refs to 'ssh://g...@git.haskell.org/haddock.git'

haddock $
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs


Re: Can't push to haddock repo

2015-10-26 Thread Herbert Valerio Riedel

In the GHC tree:

$ grep haddock packages 
utils/haddock-   -   
ssh://g...@github.com/haskell/haddock.git

says that the upstream repo for Haddock is ssh://...

(there are some comments in the 'packages' file that explain what the
last column means)

so you have to do something like

  git push ssh://g...@github.com/haskell/haddock.git 
HEAD:wip/spj-wildcard-refactor

(the 'HEAD:' part may be optional, it just says, push what is the
current HEAD of your local repo to the remote branch wip/...)

HTH

On 2015-10-26 at 13:57:55 +0100, Simon Peyton Jones wrote:
> I can't update the haddock repository!   (I want to add a new branch for my 
> in-flight work.)
> Can anyone help?
> Thanks
> Simon
>
>
> git push --set-upstream origin wip/spj-wildcard-refactor
>
> remote: W refs/heads/wip/spj-wildcard-refactor haddock simonpj DENIED by 
> refs/.*
>
> remote: error: hook declined to update refs/heads/wip/spj-wildcard-refactor
>
> To ssh://g...@git.haskell.org/haddock.git
>
> ! [remote rejected] wip/spj-wildcard-refactor -> wip/spj-wildcard-refactor 
> (hook declined)
>
> error: failed to push some refs to 'ssh://g...@git.haskell.org/haddock.git'
>
> haddock $
> ___
> ghc-devs mailing list
> ghc-devs@haskell.org
> http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs

-- 
"Elegance is not optional" -- Richard O'Keefe
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs


RE: Can't push to haddock repo

2015-10-26 Thread Simon Peyton Jones
Well in utils/haddock/.git/config I see
[remote "origin"]
url = git://git.haskell.org/haddock.git
pushurl = ssh://g...@git.haskell.org/haddock.git

So that looks right.  Why would git push not work?

Simon

| -Original Message-
| From: Herbert Valerio Riedel [mailto:hvrie...@gmail.com]
| Sent: 26 October 2015 13:04
| To: Simon Peyton Jones
| Cc: ghc-devs@haskell.org
| Subject: Re: Can't push to haddock repo
| 
| 
| In the GHC tree:
| 
| $ grep haddock packages
| utils/haddock-   -
| ssh://g...@github.com/haskell/haddock.git
| 
| says that the upstream repo for Haddock is ssh://...
| 
| (there are some comments in the 'packages' file that explain what the
| last column means)
| 
| so you have to do something like
| 
|   git push ssh://g...@github.com/haskell/haddock.git HEAD:wip/spj-wildcard-
| refactor
| 
| (the 'HEAD:' part may be optional, it just says, push what is the
| current HEAD of your local repo to the remote branch wip/...)
| 
| HTH
| 
| On 2015-10-26 at 13:57:55 +0100, Simon Peyton Jones wrote:
| > I can't update the haddock repository!   (I want to add a new branch for
| my in-flight work.)
| > Can anyone help?
| > Thanks
| > Simon
| >
| >
| > git push --set-upstream origin wip/spj-wildcard-refactor
| >
| > remote: W refs/heads/wip/spj-wildcard-refactor haddock simonpj DENIED by
| refs/.*
| >
| > remote: error: hook declined to update refs/heads/wip/spj-wildcard-
| refactor
| >
| > To ssh://g...@git.haskell.org/haddock.git
| >
| > ! [remote rejected] wip/spj-wildcard-refactor -> wip/spj-wildcard-
| refactor (hook declined)
| >
| > error: failed to push some refs to
| 'ssh://g...@git.haskell.org/haddock.git'
| >
| > haddock $
| > ___
| > ghc-devs mailing list
| > ghc-devs@haskell.org
| >
| https://na01.safelinks.protection.outlook.com/?url=http%3a%2f%2fmail.haskel
| l.org%2fcgi-bin%2fmailman%2flistinfo%2fghc-
| devs=01%7c01%7csimonpj%40064d.mgd.microsoft.com%7c8b244454862541a00577
| 08d2de05db9f%7c72f988bf86f141af91ab2d7cd011db47%7c1=kCypWx5Kq7ffV9piW
| ItQNerjzDLU68rgHUacMsV%2f5pk%3d
| 
| --
| "Elegance is not optional" -- Richard O'Keefe
___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs


RE: Can't push to haddock repo

2015-10-26 Thread Simon Peyton Jones
ah yes, my bad. Thanks

|  -Original Message-
|  From: Ben Gamari [mailto:b...@well-typed.com]
|  Sent: 26 October 2015 13:55
|  To: Simon Peyton Jones; Herbert Valerio Riedel
|  Cc: ghc-devs@haskell.org
|  Subject: RE: Can't push to haddock repo
|  
|  Simon Peyton Jones <simo...@microsoft.com> writes:
|  
|  > Well in utils/haddock/.git/config I see [remote "origin"]
|  >url = git://git.haskell.org/haddock.git
|  >pushurl = ssh://g...@git.haskell.org/haddock.git
|  >
|  Note the difference in hostnames,
|  
|  ssh://g...@git.haskell.org/haddock.git
|   ssh://g...@github.com/haskell/haddock.git
|  
|  The point being, Haddock is hosted on Github. I believe the repo on
|  git.haskell.org is merely a mirror.
|  
|  It's a bit hard to keep track of all of this at times, so the upstream
|  repositories are documented in the `packages` file at the root of the GHC
|  repository.
|  
|  Cheers,
|  
|  - Ben

___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs