Hi, On Thu, Dec 28, 2017 at 11:13:49PM +0200, Otto Kekäläinen wrote: > Package: git-buildpackage > Version: 0.8.12.2 > Severity: normal > > I've been using in my debian/gbp.conf since 2015 this line: > > ignore-branch = True > > > However today I noticed that it's not being honored anymore. While > running gbp import-orig on a branch called "stretch" it automatically > defaults to merging the new upstream into branch "master".
It defaults to merging into the current debian branch (which you can check with "gbp config import-orig.debian-branch" > I've upgraded recently from Ubuntu 12.04 to 17.04 and thus the gbp > version changed. > > The feature was introduced in > https://git.sigxcpu.org/cgit/git-buildpackage/commit/?id=7f580d9da449b13b6bb3c6aaf6f35eba05a35c7e > and I tried to track if it has changed, but I cannot find. This is a feature of buildpackage (to built from a detached head state). import-orig does not handle this option. > 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. Cheers -- Guido
