Control: reassign -1 devscripts
Control: retitle -1 debcommit: Mention ~ in tag message, not .
devscripts maintainer: For compatibility reasons with gbp buildpackage,
please do not mangle the version in the tag message, that is, use
git tag -s -m 'tagging package apt version 1.1~exp15' '1.1.exp15'
^ see here
instead of
git tag -s -m 'tagging package apt version 1.1.exp15' '1.1.exp15'
On Tue, Oct 20, 2015 at 10:22:02PM +0200, Guido Günther wrote:
> Hi,
> On Tue, Oct 20, 2015 at 07:07:22PM +0200, Julian Andres Klode wrote:
> > On Tue, Oct 20, 2015 at 07:01:58PM +0200, Guido Günther wrote:
> > > Hi,
> > > On Tue, Oct 20, 2015 at 06:25:35PM +0200, Julian Andres Klode wrote:
> > > > Package: git-buildpackage
> > > > Version: 0.6.32
> > > > Severity: normal
> > > >
> > > > Not sure what's going on, but today gbp dch stopped finding tags with
> > > > a dot instead of an underscore. Those tags are generated by debcommit
> > > > -r.
> > > >
> > > > jak@jak-x230:~/Projects/Debian/apt$ gbp dch --verbose
> > > > gbp:debug: ['git', 'rev-parse', '--show-cdup']
> > > > gbp:debug: ['git', 'rev-parse', '--is-bare-repository']
> > > > gbp:debug: ['git', 'symbolic-ref', 'HEAD']
> > > > gbp:debug: ['git', 'show-ref', 'refs/heads/debian/experimental']
> > > > gbp:debug: ['git', 'tag', '-l', '1.1_exp13']
> > > > gbp:debug: ['git', 'tag', '-l', '1.1.exp13']
> > > > gbp:debug: ['git', 'cat-file', '-p', '1.1.exp13']
> > > > gbp:error: Version 1.1~exp13 not found
> > > > jak@jak-x230:~/Projects/Debian/apt$ git tag -l 1.1.exp13
> > > > 1.1.exp13
> > > > jak@jak-x230:~/Projects/Debian/apt$ git cat-file -p 1.1.exp13
> > > > object ebd8621e5b18446dd251e90f79aa7576c6cb83b2
> > > > type commit
> > > > tag 1.1.exp13
> > > > tagger Michael Vogt <m...@ubuntu.com> 1444062630 +0200
> > >
> > > Do you have --upstream-branch set correctly? We need a more clever
> > > probing for that one. Might be different since you're packaging an
> > > experimental version.
> >
> > It's a native package, and debian-branch is correct, whereas
> > upstream-branch is unset (but setting it does not change anything).
> >
> > Strangely enough, this used to work during DebConf, so it seems
> > to be a regression caused by one of gbp's dependencies (git 2.6?).
>
> I completely misread your original mail, sorry!
>
> So you would expect "gbp dch" to handle 1.1.exp13 as 1.1~exp13? That
> is to pick up everything from 1.1.exp13 up to your current head and
> add it to your changelog as 1.1~exp14?
>
> For tags that don't map ~ -> _ we expect to find the _real_ version
> number in the tags content. That is the tag should have:
>
> $ git cat-file -p 1.1.exp13
> object ebd8621e5b18446dd251e90f79aa7576c6cb83b2
> type commit
> tag 1.1~exp13
> ^
>
> But it actually has (as cloned from https://github.com/Debian/apt.git):
>
> $ git cat-file -p 1.1.exp13
> object ebd8621e5b18446dd251e90f79aa7576c6cb83b2
> type commit
> tag 1.1.exp13
> ^
> tagger Michael Vogt <m...@ubuntu.com> 1444062630 +0200
>
> So theres no way for gbp to figure out that you meant ~ instead of and it
> doesn't
> find a tag corresponding to the topmost version in the changelog.
>
> If I retag with:
>
> git tag -m"tag 1.1~exp13" 1.1.exp13
> ebd8621e5b18446dd251e90f79aa7576c6cb83b2
>
> it works as expected so I'd say there's no bug in gbp here but the tag
> is actually wrong. O.k.?
>
> If the tag was really created with debcommit this would be a bug there I
> think.
>
Thanks, yes. I'm reassigning.
That explains why it worked before, as the previous tags were not signed.
--
Julian Andres Klode - Debian Developer, Ubuntu Member
See http://wiki.debian.org/JulianAndresKlode and http://jak-linux.org/.
Be friendly, do not top-post, and follow RFC 1855 "Netiquette".
- If you don't I might ignore you.
