git: refactor tests to use managed transports and fix switchToBranch #373
Conversation
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
aryan9600
force-pushed
the
managed-transport-default
branch
from
8d6ecfb to
668f72a
Compare
Signed-off-by: Sanskar Jaiswal <sanskar.jaiswal@weave.works>
aryan9600
force-pushed
the
managed-transport-default
branch
from
668f72a to
0423fa8
Compare
hiddeco
reviewed
Jun 2, 2022
aryan9600
force-pushed
the
managed-transport-default
branch
from
0423fa8 to
79f988f
Compare
darkowlzz
reviewed
Jun 2, 2022
darkowlzz
reviewed
Jun 2, 2022
darkowlzz
reviewed
Jun 2, 2022
hiddeco
changed the title
darkowlzz
reviewed
Jun 2, 2022
darkowlzz
reviewed
Jun 2, 2022
darkowlzz
reviewed
Jun 2, 2022
darkowlzz
reviewed
Jun 2, 2022
darkowlzz
reviewed
Jun 2, 2022
darkowlzz
reviewed
Jun 2, 2022
darkowlzz
reviewed
Jun 2, 2022
darkowlzz
reviewed
Jun 2, 2022
darkowlzz
reviewed
Jun 2, 2022
darkowlzz
reviewed
Jun 2, 2022
added 3 commits
June 2, 2022 19:09
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>
Signed-off-by: Sanskar Jaiswal <sanskar.jaiswal@weave.works>
Signed-off-by: Sanskar Jaiswal <sanskar.jaiswal@weave.works>
aryan9600
force-pushed
the
managed-transport-default
branch
from
79f988f to
175f91e
Compare
darkowlzz
approved these changes
Jun 2, 2022
hiddeco
approved these changes
Jun 2, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is a follow up to #369.
It refactors the tests to use managed transports, since that's the default now.
It also fixes a regression introduced in #330, which would result in the controller failing to push commits, if the remote is ahead of the local branch. This was partially addressed in #369, by fetching the commits, but it failed to update the local branch target to be at the latest commit.
Fixes most of #370