Delete unused branch plugin: Makes GetBranchNames() support worktrees #11376
Conversation
This file contains hidden or 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
7c0f6cb to
55c2a2a
Compare
|
@jonnydee You could test the fix in the portable version built and please confirm that it solves the issue: https://ci.appveyor.com/project/gitextensions/gitextensions/builds/48578287/artifacts |
mstv
approved these changes
Nov 21, 2023
gerhardol
approved these changes
Nov 21, 2023
UnitTests/Plugins/DeleteUnusedBranches.Tests/GitBranchOutputCommandParserTests.cs
Outdated
Show resolved
Hide resolved
UnitTests/Plugins/DeleteUnusedBranches.Tests/GitBranchOutputCommandParserTests.cs
Outdated
Show resolved
Hide resolved
RussKie
reviewed
Nov 22, 2023
|
Should we patch 4.2? |
@pmiossec I can confirm that the fix solves the issue. That was pretty fast, thank you very much! |
Yes, please! |
by parsing correctly the output of the command `git branch --list --merged HEAD` that contains "+ " prefix in front of branch names checked out in git worktrees + add support of some other edge cases Fixes gitextensions#11375 + makes git log command a little more resilient by appending '--' like done in gitextensions#11277
55c2a2a to
88e76fc
Compare
|
Fixed everything (I think). Rebased on and targeted |
|
Thank you |
This was referenced Aug 3, 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.
by parsing correctly the output of the command
git branch --list --merged HEADthat contains "+ " prefix in front of branch names checked out in git worktrees
Fixes #11375
Screenshots
Before
After
Test methodology
Test environment(s)
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.