-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add worktree option to fast forwarding operation #4051
Open
john-mutuma
wants to merge
4
commits into
jesseduffield:master
Choose a base branch
from
john-mutuma:fastforward-worktree-path
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add worktree option to fast forwarding operation #4051
john-mutuma
wants to merge
4
commits into
jesseduffield:master
from
john-mutuma:fastforward-worktree-path
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
Thanks for raising this. I'd copy+paste this test and tweak it for this PR. |
john-mutuma
force-pushed
the
fastforward-worktree-path
branch
from
November 21, 2024 14:32
76d997f
to
dfeddca
Compare
john-mutuma
commented
Nov 21, 2024
...tegration/tests/worktree/fast_forward_worktree_branch_should_not_pollute_current_worktree.go
Show resolved
Hide resolved
jesseduffield
force-pushed
the
fastforward-worktree-path
branch
from
November 23, 2024 01:28
99e8607
to
7ad96db
Compare
jesseduffield
approved these changes
Nov 23, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Will merge after tests pass
There was a linting fault caught, now corrected. |
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.
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 ./...
)