Checkout after creating a new branch #384
Merged
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
|
|
jannfis
reviewed
Feb 21, 2022
There was a problem hiding this comment.
Thanks @katainaka0503! I just have a question, please see below.
@nick-homex since you initially contributed the write-back branch feature, can you please have a look at this as well?
pkg/argocd/update_test.go
Outdated
| @@ -1786,7 +1786,7 @@ func Test_CommitUpdates(t *testing.T) { | |||
| defer cleanup() | |||
| gitMock.On("Checkout", mock.Anything).Run(func(args mock.Arguments) { | |||
| args.Assert(t, "mydefaultbranch") | |||
| }).Return(nil) | |||
| }).Return(nil).Once() | |||
There was a problem hiding this comment.
Can you please explain why the .Once() is necessary?
There was a problem hiding this comment.
Thank you for your comment.
This is because in the current code, after checking out the source branch, argo cd checks out push branch .
But, technically, this is not necessary.
I'll fix it.
katainaka0503
force-pushed
the
fix-write-checkout-branch-separation-feature
branch
from
e712be2 to
41ba108
Compare
jannfis
approved these changes
Feb 23, 2022
katainaka0503
deleted the
fix-write-checkout-branch-separation-feature
branch
sribiere-jellysmack
pushed a commit
to sribiere-jellysmack/argocd-image-updater
that referenced
this pull request
Aug 13, 2024
* Checkout after creating a new branch * Fix test * Fix unnecessary checkout
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.
I'm a big fan of the new feature below. It will allow us more flexible GitOps operations.
#304
However, I found a bug after trying the feature by myself on my local environment.
It seems after creating a new branch,
Argo CDdoesn't checkout the newly created branch. In the end, the new branch is pushed without any changes committed.So, I've moved checkout process to after branch creation.