Add worktree option to fast forwarding operation #4051
+73
−0
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.
Fix a reported issue regarding Fast-forwarding a branch that is checked out in a different worktree. It's reported, and I could repro, that whenever such an action is taken, the current worktree is polluted with unwanted File changes related to the Fast-forward operation.
A solution is suggested – and tested to produce expected results – that adding
--work-tree
option to the generated command should fix the issue.Issue: 2957
I'm proposing to merge these changes as it produces expected results:
go generate ./...
)