fix(git): write back to custom git branch failed by rejected push: tip of your current branch is behind (argoproj-labs#882)

chengfang · Tchoupinax · commit 597953661ad7 · 2024-10-23T22:58:04.000+02:00
Signed-off-by: Cheng Fang &lt;cfang@redhat.com&gt;
Signed-off-by: Tchoupinax &lt;corentinfiloche@hotmail.fr&gt;
diff --git a/pkg/argocd/git.go b/pkg/argocd/git.go
@@ -246,7 +246,7 @@ func commitChangesGit(app *v1alpha1.Application, wbc *WriteBackConfig, changeLis
 	if err != nil {
 		return err
 	}
-	err = gitC.Push("origin", pushBranch, false)
+	err = gitC.Push("origin", pushBranch, pushBranch != checkOutBranch)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ func commitChangesGit(app v1alpha1.Application, wbc WriteBackConfig, changeLis`
`246`	`246`	`if err != nil {`
`247`	`247`	`return err`
`248`	`248`	`}`
`249`		`- err = gitC.Push("origin", pushBranch, false)`
	`249`	`+ err = gitC.Push("origin", pushBranch, pushBranch != checkOutBranch)`
`250`	`250`	`if err != nil {`
`251`	`251`	`return err`
`252`	`252`	`}`