[git-buildpackage] Blog post review request: An explainer of the optimal git repository structure in 2025

[Guido Günther]

Hi,
On Mon, Jan 20, 2025 at 09:59:06AM +0100, Johannes Schauer Marin Rodrigues wrote:
> Hi,
> 
> Quoting Guido Günther (2025-01-20 09:48:13)
> > On Mon, Jan 20, 2025 at 12:05:15AM -0800, Otto Kek�l�inen wrote:
> > > > I'd like to piggy back a question for you to this mail. I just converted box64
> > > > to dep14 branch layout manually. You probably saw my responses to the salsa
> > > > devscripts MR of yours. To fix the problems, I deleted my local git clone and
> > > > created a new one with:
> > > >
> > > >     gbp clone --add-upstream-vcs https://salsa.debian.org/debian/box64.git
> > > >
> > > > Now everything works. So somehow my local git repo was borked. I tried
> > > > importing the new upstream release but got this:
> > > >
> > > >    gbp:error: Import of ../box64_0.3.2+dfsg.orig.tar.xz failed: Can't find upstream vcs tag at 'v0.3.2+dfsg'
> > > >
> > > > How do I tell gbp that my Debian version has a +dfsg suffix which has to be
> > > > stripped off when searching for the upstream tag?
> > 
> > We unmangle the Debian version (remove the +dfsg) automatically:
> > 
> >    https://salsa.debian.org/agx/git-buildpackage/-/blob/master/gbp/deb/git.py#L137
> > 
> > then call `version_to_tag` to get the upstream's vcs tag so make sure
> > your `vcs_tag_format` (which comes from `--upstream-vcs-tag` doesn't add the
> > `+dfsg` back.
> 
> ah great, so this is supposed to work. Nice! I'm still at a loss though about
> what my debian/gbp.conf should say such that this works. I consulted
> gbp-import-orig(1) but didn't find an answer. Currently I have this
> (contributed by Otto):
> 
>     upstream-vcs-tag = v%(version%~%.)s
> 
> Note that I'm on Bookworm so my gbp might also be too old?

Yes, bookworm is too old for that.
 -- Guido

> 
> Thanks!
> 
> cheers, josch