Hi Otto,
On Thu, Dec 28, 2017 at 11:33:20PM +0200, Otto Kekäläinen wrote:
> Thanks for a quick reply!
>
> >> In the old version I was using "git-buildpackage --import-orig" and
> >> the man page at
> >> https://manpages.debian.org/jessie/git-buildpackage/git-buildpackage.1.en.html
> >> documents the ignore-branch flag.
> >
> > For buildpackage but not for import-orig.
> >
> >> The new "gbp import-orig" seems to miss this:
> >> https://manpages.debian.org/stretch/git-buildpackage/gbp-import-orig.1.en.html
> >
> > See above. I don't think there's a bug here.
>
> So "git-buildpackage --import-orig" and "gbp import-orig" are not
> supposed to do the same thing?
There's no such thing. There's only
gbp <command>
so either.
gbp import-orig
or
gbp buildpackage
git-buildpackage --import-orig does not exist and IIRC never
existed. Maybe you have a local alias or something? The gbp
"supercommand" was introduced in 2013.
> Indeed, this is how it looks now:
>
> $ gbp config import-orig.debian-branch
> import-orig.debian-branch=master
>
>
> $ cat debian/gbp.conf
> [DEFAULT]
> # Ignore requirement to use branch name 'master' to make it easier
> # for contributors to work with feature and bugfix branches
> ignore-branch = True
>
> # Always use pristine tar
> pristine-tar = True
>
> # Sign tags
> sign-tags = True
>
> [import-orig]
> filter =
> ['debian/*','debian/*/*','CVS','*.bak','*~','.cvsignore','.#*','autom4te/*','autom4te.cache/*','.svn']
>
>
> What should I put in my gbp.conf so that 'gbp config
> import-orig.debian-branch' would become whatever branch is currently
> checked out instead of default master?
I'd recommend to put into debian/gbp.conf the actual branch. So if you
maintain stretch on the debian/stretch branch:
[DEFAULT]
debian-branch=debian/stretch
and if you maintain artful on ubuntu/artful
[DEFAULT]
debian-branch=ubuntu/artful
This will make sure that all the tools pick up the correct
branch not only import-orog. S.th. like
[DEFAULT]
debian-branch=auto
is planned (see #829445) but there's lots of details to get right so it
didn't happen yet. If you have futher comments on how branches should be
picked up please comment on 829445.
So o.k. to close this one?
Cheers,
-- Guido
