fix(gitsyncer): suppress any error returned by rebase abort (#126)

Release v2.2.1

Author: IvoGoman

CHANGELOG.md

@@ -4,6 +4,10 @@ SPDX-FileCopyrightText: 2025 SAP SE or an SAP affiliate company
 SPDX-License-Identifier: Apache-2.0
 -->
 
+## v2.2.1 - 2025-01-20
+
+- Fix suppress any errors on git rebase --abort
+
 ## v2.2.0 - 2025-01-20
 
 - Fix suppress error if no rebase in progress

pkg/git/git.go

@@ -67,14 +67,8 @@ func (g *Git) GetRemoteHEADCommitHash() (string, error) {
 
 // PullRebase pulls and rebases.
 func (g *Git) PullRebase() error {
-	_, err := g.run("rebase", "--abort")
-	if err != nil {
-		// ignore error if there is no rebase in progress
-		if !strings.Contains(err.Error(), "no rebase in progress") {
-			return errors.Wrap(err, "git rebase --abort failed")
-		}
-	}
-	_, err = g.run(
+	_, _ = g.run("rebase", "--abort") //nolint:errcheck
+	_, err := g.run(
 		"-c", fmt.Sprintf(`user.name="%s"`, g.AuthorName),
 		"-c", fmt.Sprintf(`user.email="%s"`, g.AuthorEmail),
 		"pull",