Hi, On 2025-09-14 22:53:23, Samuel Henrique wrote:
since no objections were raised I proceeded and changed the merge method for all projects in the pkg-security-team namespace to "fast-forward merge".On Thu, 11 Sept 2025 at 21:46, Simon Josefsson <simon@josefsson.org> wrote:Peter Wienemann <wiene@debian.org> writes:merging [0] reminded me of our discussion to change the merge behaviour for security tools team packages on salsa during DebConf25 (no merge commits anymore) [1]. Are there objections to this plan from persons who did not participate in the DebConf BoF?I also prefer fast forward merges so +1 from me.+1 from me too.
It would be nice to update our create-repo script [0] to automatically set this merge method for new repositories. Unfortunately there is no way to do it using the "salsa" command at the moment (see also this wishlist bug [1] by Raphaël). Therefore I ended up using the "python-gitlab project update" command [2] (from the "gitlab-cli" package) to perform this bulk change.
Best regards Peter[0] https://salsa.debian.org/pkg-security-team/pkg-security-team/-/blob/c0bb1a5012990a19055328a980381751c00568c5/bin/create-repo
[1] https://bugs.debian.org/932986[2] https://python-gitlab.readthedocs.io/en/stable/cli-objects.html#gitlab-project-update
Attachment:
OpenPGP_0x5D5F6C020398A60A.asc
Description: OpenPGP public key
Attachment:
OpenPGP_signature.asc
Description: OpenPGP digital signature