Re: Fix in branch 2025Q3 without a need to fix in main
Date: Sat, 19 Jul 2025 12:39:19 UTC
> On Jul 19, 2025, at 14:24, Rainer Hurling <rhurlin@gwdg.de> wrote: > > Dear committers, > I have a question about a specific case that I haven't encountered before: > > My port math/saga is at version 9.9.0 in the main branch and at version 9.8.2 in the 2025Q3 branch. In version 9.8.2, a patch was forgotten upstream during the release, which means that 9.8.2 now fails to build in the package builders. (Interestingly, I can build the version in Poudriere.) I would now like to commit the appropriate patch only for version 9.8.2 in the 2025Q3 branch, as main in version 9.9.0 already contains this patch. > > When I try to push the commit, I get the following message: > > ================================================================ > remote: rhurlin, you are pushing a commit to 2025Q3 which does > remote: not seem to be a cherry-pick. > remote: > remote: If you did a cherry-pick, you probably forgot to add `-x`, > remote: make sure you do run `git cherry-pick -x <hash>`. > remote: > remote: If you did a direct commit, make sure it was approved first, and then run: > remote: git push --push-option=direct-quarterly-commit > remote: ================================================================ > > Do I actually need approval in the case described, and if so, from whom? > > Or can I simply push directly with the argument ‘--push-option=direct-quarterly-commit’ instead? > > Thanks for your help. > No. You do not need approval. But your direct commit should be descriptive enough to justify the direct commit. Kind regards, Moin