fix(add-ons): skip empty commits in cherry-pick

These might be result of merging/rebasing changes upstream.

Fixes WEBLATE-37ZV

Author: nijel

docs/changes.rst

@@ -13,10 +13,13 @@ Weblate 5.17
 
 .. rubric:: Bug fixes
 
+* :ref:`addon-weblate.git.squash` better handle commits applied upstream.
+
 .. rubric:: Compatibility
 
 * Dropped support for MySQL and MariaDB as the database engine.
 * Weblate now requires Django 6.0.
+* Weblate now requires Git 2.45 or newer.
 
 .. rubric:: Upgrading
 

weblate/addons/git.py

@@ -214,7 +214,7 @@ def squash_author(self, component: Component, repository: GitRepository) -> None
                 # Cherry pick current commit (this should work
                 # unless something is messed up)
                 repository.execute(
-                    ["cherry-pick", commit, *gpg_sign],
+                    ["cherry-pick", "--empty=drop", commit, *gpg_sign],
                     environment={"WEBLATE_MERGE_SKIP": "1"},
                 )
                 handled = []
@@ -224,7 +224,7 @@ def squash_author(self, component: Component, repository: GitRepository) -> None
                         continue
                     try:
                         repository.execute(
-                            ["cherry-pick", other[0], *gpg_sign],
+                            ["cherry-pick", "--empty=drop", other[0], *gpg_sign],
                             environment={"WEBLATE_MERGE_SKIP": "1"},
                         )
                         handled.append(i)

weblate/vcs/git.py

@@ -105,7 +105,7 @@ class GitRepository(Repository):
     push_label: ClassVar[StrOrPromise] = gettext_lazy(
         "This will push changes to the upstream Git repository."
     )
-    req_version: ClassVar[str | None] = "2.28"
+    req_version: ClassVar[str | None] = "2.45"
     default_branch: ClassVar[str] = "master"
     ref_to_remote: ClassVar[str] = "..{0}"
     ref_from_remote: ClassVar[str] = "{0}.."