Your message dated Fri, 18 Jul 2025 17:33:54 +0000
with message-id <[email protected]>
and subject line Bug#1107921: fixed in dgit 13.8
has caused the Debian Bug report #1107921,
regarding git-debpush fetch before making tag
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1107921: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1107921
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-debpush
Version: 13.2
While uploading src:dgit to expeerimental, I discovered that my git
remote was misconfigured. So it made the tag, but then failed to
push. This isn't a very nice failure mode, particularly because
fixing the config and retrying doesn't work because the tag has
already been made.
I suggest:
* After doing all the local checks, but before making the tag, run
git fetch on the selected remote. (Not in --tag-only and
--print-tag-text modes.) We should probably do a ref-limited fetch
covering the tag we are proposing to make, and
* Check that the local branch is ff from the remote. (If it isn't
then someone has pushed to salsa in the mesntime. Probably, the
user wants to know about this.)
* If the remote branch is ff from the local one, do not attempt to
push it. This can happen if the user overrode the previous check,
an is deliberately tagging an older commit.
It also happens if the remote and local branches are the same. Not
pushing the branch in this case is good because it means that if
the git-debpush user is racing with something on salsa, the push
doesn't fail after making the tag.
This might also help with a forge that prevents "git push" and only
allows explicit MR merge operatiuons. Gitlab has that option, but
empirically it doesn't object if the push you're making won't
actually update the remote ref.
* Provide options which can be used to retry a push, including
a way to push only the tag. How about --retry-push
and --no-branch (= `--branch=HEAD~0`).
For testing, we may want to invent a new test case that just tests
git-debpush corner cases but doesn't invoke the whole t2u machinery to
process the actual tag. That would also help us in the future when
we'll want to update the server-side machinery to new dependencies but
still be able to test git-debpush on old releases.
Ian.
--
Ian Jackson <[email protected]> These opinions are my own.
Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.
--- End Message ---
--- Begin Message ---
Source: dgit
Source-Version: 13.8
Done: Ian Jackson <[email protected]>
We believe that the bug you reported is fixed in the latest version of
dgit, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Ian Jackson <[email protected]> (supplier of updated dgit package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Fri, 18 Jul 2025 17:36:28 +0100
Source: dgit
Architecture: source
Version: 13.8
Distribution: experimental
Urgency: medium
Maintainer: Debian tag2upload Delegates <[email protected]>
Changed-By: Ian Jackson <[email protected]>
Closes: 1107921
Changes:
dgit (13.8) experimental; urgency=medium
.
git-debpush user experience improvements:
* Check for and handle an existing tag for this version.
* Try to check our branch against the remote target branch,
to detect releasing from behind mainline, and avoid push failures.
* Closes: #1107921.
.
Internal changes:
* dgit: Provide abbreviated --t2u-* options, to support log improvements.
* git-debpush: Improve comment about remote branch. [Sean Whitton]
* git-debpush: Coding style cleanups.
* dir-locals.el: Set fill-column to 78 for all languages.
Checksums-Sha1:
3672dc205062cb50b0f913fd5b057e700a84882c 2106 dgit_13.8.dsc
6137fbcfd33600f00b312b8ec396eaf7cff12bc6 769138 dgit_13.8.tar.gz
Checksums-Sha256:
c74fedb0a39a0fc8688d311e87e326e5fcce48e7c0862db7c5ceccd704d90609 2106
dgit_13.8.dsc
7d011fec3abbf2974be3002efae58e6e3380c600023fcbe472bcac04aeaf3318 769138
dgit_13.8.tar.gz
Files:
adf490cf09943cdb3a2805b866023457 2106 devel optional dgit_13.8.dsc
9a820fc3cfe9bc9567f5de76be077b93 769138 devel optional dgit_13.8.tar.gz
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCgAdFiEEVZrkbC1rbTJl58uh4+M5I0i1DTkFAmh6gTMACgkQ4+M5I0i1
DTm4QwgAn4wvljEGkjWSCa+WjTuXknBGq6+vpJhJNijEYFfAIrf0HXIP1uczorv/
fUWWWNGHu7MXx8JHpE+oGjDU5ei5Y0BXyzz4TIORFof4ACE+ArbKxnrq1bJLYjsI
rXb5UhppmEodR4D6uNSk5ifJSqZ4y5RMZnXzJQc+2hzNlOuw/qq4mfg/IWrB/2+U
3aehpaN3Bw/tqzfN6JWROZpH6u1zkYd24W407z3I7RvwiuahLtyUutiFNZBVSQcN
Vtsq1hmnJzGMLkxkO0O59Q7YEg1UOZIa5tYnBXchnXztD3eAzFvIwodWB5MQ4cx0
9sUU45OIY8bFpIHBeeSI0qXihF3CLA==
=BmMy
-----END PGP SIGNATURE-----
pgpjy7W_ibIpj.pgp
Description: PGP signature
--- End Message ---
