forked from fluxcd/image-automation-controller
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes regression in which we fail to push to a branch after switching to a branch, if origin is ahead of local. Fixed by setting the upstream commit as the local branch target. Regression introduced in fluxcd#330, and partially addressed in fluxcd#369. Signed-off-by: Sanskar Jaiswal <sanskar.jaiswal@weave.works>
- Loading branch information
Sanskar Jaiswal
committed
Jun 2, 2022
1 parent
74420bd
commit 79f988f
Showing
3 changed files
with
125 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters