fix(git): improve cherry-pick abort handling

Author: sentry[bot]

weblate/addons/git.py

@@ -213,10 +213,15 @@ def squash_author(self, component: Component, repository: GitRepository) -> None
                 base = repository.get_last_revision()
                 # Cherry pick current commit (this should work
                 # unless something is messed up)
-                repository.execute(
-                    ["cherry-pick", commit, *gpg_sign],
-                    environment={"WEBLATE_MERGE_SKIP": "1"},
-                )
+                try:
+                    repository.execute(
+                        ["cherry-pick", commit, *gpg_sign],
+                        environment={"WEBLATE_MERGE_SKIP": "1"},
+                    )
+                except RepositoryError:
+                    if repository.has_git_file("CHERRY_HEAD"):
+                        repository.execute(["cherry-pick", "--abort"])
+                    raise
                 handled = []
                 # Pick other commits by same author
                 for i, other in enumerate(commits):
@@ -231,7 +236,8 @@ def squash_author(self, component: Component, repository: GitRepository) -> None
                     except RepositoryError:
                         # If fails, continue to another author, we will
                         # pick this commit later (it depends on some other)
-                        repository.execute(["cherry-pick", "--abort"])
+                        if repository.has_git_file("CHERRY_HEAD"):
+                            repository.execute(["cherry-pick", "--abort"])
                         break
                 # Remove processed commits from list
                 for i in reversed(handled):