diff options
| author | Cheng Fang <cfang@redhat.com> | 2024-10-04 09:09:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-04 09:09:30 -0400 |
| commit | fb8b39dae73229c751f22d67324d4d194db67deb (patch) | |
| tree | 9dcf3456b21590c971de42583557e232a53db7e1 | |
| parent | 720f495fcc3a5a05432fc40c95a08ae49fccba5f (diff) | |
fix(git): write back to custom git branch failed by rejected push: tip of your current branch is behind (#882)
Signed-off-by: Cheng Fang <cfang@redhat.com>
| -rw-r--r-- | pkg/argocd/git.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/argocd/git.go b/pkg/argocd/git.go index 2bc08f4..13e62b6 100644 --- 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 } |