On Thu, Jan 25, 2018 at 8:11 AM, Guido Günther <a...@sigxcpu.org> wrote:

> Hi Michael,
> On Wed, Jan 24, 2018 at 10:27:25PM +0100, Michael Stapelberg wrote:
> > Package: git-buildpackage
> > Version: 0.9.6
> > Severity: wishlist
> >
> > When using a pure git workflow (no tarballs involved), as documented in
> > file:///usr/share/doc/git-buildpackage/manual-html/gbp.
> import.upstream-git.html,
> > it is common to configure the “upstream” git remote to be the actual
> upstream,
> > whereas the “origin” git remote would be a repository on alioth.
> >
> > E.g., for the golang-text package, I would configure:
> > remote “origin” is git.debian.org:/git/pkg-go/packages/golang-text.git
> > remote “upstream” is https://github.com/kr/text
> >
> > Now, when another team member of the pkg-go team uses gbp-clone on the
> alioth
> > repository, they won’t get my “upstream” git remote configuration.
> >
> > This means publishing git repositories is lossy: what I have on my hard
> disk
> > does not reflect what other team members will get when they clone the
> > repository.
> >
> > This makes updating packages way harder than it should be :)
> >
> > Could we add options to debian/gbp.conf to get an upstream git remote
> configured
> > automatically when cloning please?
>
> For purely git based workflow this makes. For this to be nicely integrated
> we'd
> need to store the information somehwere in the packakge e.g.
>
>   X-Upstream-VCS:
>
> in debian control so not each packaging team has to cook it's own solution.
> However it could be nicely protyped using gbp clone's postclone hooks.
> Cheers,
>  -- Guido
>
>
Done, see
https://github.com/Debian/pkg-go-tools/blob/master/cmd/pgt-remote-add-upstream/upstream.go

To install, use:
% sudo apt install golang-go git
% go get -u github.com/Debian/pkg-go-tools/cmd/pgt-remote-add-upstream

Then, use the binary in ~/go/bin/pgt-remote-add-upstream as postclone hook.

While this works for the time being, I’d like to see it in git-buildpackage
proper, if only because hook configuration is cumbersome to do in a
packaging-group-specific way.

I noticed that the xorg-team also has a similar script:
http://x.debian.net/reference/git-usage.html (search for
“xsf-remote-add-upstream”). Theirs uses debian/watch.

kibi, would xorg-team be happy with gbp looking at the X-Vcs-Upstream-Git
key/value pair in debian/control, or do you have any special requirements?

-- 
Best regards,
Michael

Reply via email to