Clear remote ref with auto merge #219
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
ofalvai
reviewed
Feb 19, 2024
| @@ -162,3 +162,10 @@ func (g *Git) SparseCheckoutSet(opts ...string) *command.Model { | |||
| args = append(args, opts...) | |||
| return g.command(args...) | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
How did this update if there is no go.sum change? Is the vendor folder consistent?
There was a problem hiding this comment.
Updated with correct vendor updates.
ofalvai
reviewed
Feb 19, 2024
| @@ -40,8 +40,15 @@ func (c checkoutPRMergeRef) do(gitCmd git.Git, fetchOpts fetchOptions, fallback | |||
| // https://git-scm.com/book/en/v2/Git-Internals-The-Refspec | |||
| refSpec := fmt.Sprintf("%s:%s", c.remoteMergeRef(), c.localMergeRef()) | |||
|
|
|||
| // delete remote branch ref | |||
There was a problem hiding this comment.
Can you add a comment explaining why we need this? It's not trivial and no one will remember in a year
ofalvai
reviewed
Feb 19, 2024
| // $ git update-ref -d refs/remotes/pull/7/merge | ||
| err := deleteRef(gitCmd, c.remoteMergeRef()) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to delte ref: %w", err) |
There was a problem hiding this comment.
The doc says that it first verifies that the ref exists before deleting it.. Which means we can't just run it all the time, it's going to bubble up the error if there is nothing to clean up.
There was a problem hiding this comment.
Tested on macos/linux, the git command does not fail.
ofalvai
approved these changes
Feb 22, 2024
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.
Checklist
step.ymlandREADME.mdis updated with the changes (if needed)Version
Requires a PATCH version update
Context
When the git checkout directory is persisted between runs, we can encounter the following;
Changes
Investigation details
Decisions