#1109531 git-debrebase: the release tag should end up on the commit that says it's preparing the release

Package:
git-debrebase
Source:
git-debrebase
Submitter:
Philip Hands
Date:
2025-07-19 16:27:02 UTC
Severity:
normal
#1109531#5
Date:
2025-07-19 16:25:01 UTC
From:
To:
Hi Ian et al,

As mentioned in person at DC25, when debrebase does it's work, it ends up
producing something like this:

66c99d788 (tag: debian/5.1751519172.720c194b1-1_fto12+1, salsa/debian/latest) Merge remote-tracking branch 'salsa/debian/latest' into debian/latest
23a575c6a Commit patch queue (exported by git-debrebase)
d18e07ea9 avoid broken sorting caused by 'serverSide: true'
765ff870a apparmor: add Debian path for tesseract data
    ...
8ca221800 Debian-ify fetchneedles
7d4f97dd7 Debian uses apt to list packages
7048d83ec Debian specific apparmor changes
8c23b761b Debian tweaks for apache config
4d26808b0 changelog: releasing 5.1751519172.720c194b1-1~fto12+1
4de3fdaa0 Build-depend: python3-argparse-manpage
e5106d696 use local Roboto copy (embeded copy)
5769109c4 Update changelog for new upstream 5.1751519172.720c194b1
721e9591c Update to upstream 5.1751519172.720c194b1

where the tag goes on the merge, but the "releasing" commit is on the other side
of all the patches to upstream.

I would prefer it if that ended up like this:

66c99d788 (tag: debian/5.1751519172.720c194b1-1_fto12+1, salsa/debian/latest) Merge remote-tracking branch 'salsa/debian/latest' into debian/latest
23a575c6a Commit patch queue (exported by git-debrebase)
4d26808b0 changelog: releasing 5.1751519172.720c194b1-1~fto12+1
d18e07ea9 avoid broken sorting caused by 'serverSide: true'
765ff870a apparmor: add Debian path for tesseract data
    ...

or perhaps even:

4d26808b0 (tag: debian/5.1751519172.720c194b1-1_fto12+1, salsa/debian/latest) changelog: releasing 5.1751519172.720c194b1-1~fto12+1
66c99d788 Merge remote-tracking branch 'salsa/debian/latest' into debian/latest
23a575c6a Commit patch queue (exported by git-debrebase)
d18e07ea9 avoid broken sorting caused by 'serverSide: true'
765ff870a apparmor: add Debian path for tesseract data
    ...


so that the releasing changelog change is close-to or on the thing that says
it's making the release. and the commits that modify the upstream don't end up
looking a bit like they were applied after the release version, when one looks at
the git log (without paying attention to the tag).

Cheers, Phil.