Guido Günther wrote: > On Fri, Jul 04, 2008 at 05:15:44PM -0500, Adam Majer wrote: > [..snip..] >> Yes, that's what I'm using right now (*just* figured this out before >> your email). But using this should not really be necessary. It >> essentially makes usage of the config file option to specify the branch >> kind of meaningless as it needs to be updated every single rebase. > Here's what gbp does in more detail: > > 1) check if you gave --git-upstream-branch on the cmd line > 2) else check if it finds a tag for the current upstream version in debian > changelog > 3) else uses the HEAD of upstream-branch > > What you want is 2) I guess. Your problem seems to be that gbp can't > grab the tag, it expects the tag to be upstream/%(version)s- if this > isn't the case you'd have to use the upstream-tag option in gbp.conf to > specify the tag format. In your case this should be: > > upstream-format=v%(version)s > > This way gbp should find the right upstream version automatically. Is it > that what you're looking for? > > If so I should probably add this to the documentation - a patch for that > would be welcome. > --Guido >
I actually have that but under a different name. From the /etc/git-buildpackage/gbp.conf which is referred in the man page, and seems to be used by git-buildpackage itself # the default tag formats used: #upstream-tag = upstream/%(version)s [DEFAULT] debian-branch = deb debian-tag = debian/%(version)s upstream-tag = v%(version)s is what I use. $ git tag -l v2.1* v2.1.0 v2.1.0_RC1 are upstream tags. git-buildpackage seems to ask for upstream-tag, though it didn't work for me. Still used head unless I specified the v2.1.0 tag in upstream-branch commandline option. - Adam -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
