Hi Daniel, On Wed, Jan 20, 2016 at 05:38:48PM -0500, Daniel Kahn Gillmor wrote: > hi gbp'ers-- > > i used to use DEFAULT.debian-branch in gbp.conf when the debian > packaging is on a branch not named "master". But recently that appears > to not work, and i need to use DEFAULT.git-debian-branch instead. > > however the default /etc/git-buildpackage/gbp.conf appears to still call > it DEFAULT.debian-branch in its comments. > > I'm using git-buildpackage 0.7.1. should the default config file be > updated? or the code changed? or updated documentation written?
The config file variables are always called debian-branch and upstream-branch. We only have the --git-* prefix on the commandline of "gbp buildpackge" to distinguish our options from options passed to the builder (this was inspired by svn-buildpackage back then). So if [DEFAULT] debian-branch = <whatever> does not work this would be a bug. I don't see this here though. I e.g. have [DEFAULT] upstream-branch=upstream/sid debian-branch=debian/sid in debian/gbp.conf of e.g. libvirt without problems. $ gbp config buildpackage.debian-branch buildpackage.debian-branch=debian/sid $ gbp buildpackage --help | grep -A 2 -e --git-debian-branch --git-debian-branch=DEBIAN_BRANCH Branch the Debian package is being developed on, default is 'debian/sid' (both command run from within the repo that has the debian/gbp.conf). And outside of that repo: $ gbp config buildpackage.debian-branch buildpackage.debian-branch=master The code did not change recently so I really wonder what could trigger this on your end? Are you overriding branch names in a [buildpackage] section as well? Cheers, -- Guido _______________________________________________ git-buildpackage mailing list email@example.com http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage