Checkout: fix git error when branch name is ambiguous #11277
Merged
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
gerhardol
approved these changes
Oct 16, 2023
mstv
approved these changes
Oct 16, 2023
|
Is it possible to add a regression test simulating the original situation?
|
98ad0e8 to
bdd024b
Compare
When trying to checkout a branch **with the same name than an existing folder** like 'scripts" in GitExtensions repository, git fails when running command line: git rev-list afe67a23d35300169ba539bb220be43e788dbfb0 ^scripts --count with error: fatal: ambiguous argument 'scripts': both revision and filename Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' Fix: replace by command line:line git rev-list afe67a23d35300169ba539bb220be43e788dbfb0 ^scripts --count --
bdd024b to
08730ee
Compare
Done. |
RussKie
approved these changes
Oct 17, 2023
pmiossec
added a commit
to pmiossec/gitextensions
that referenced
this pull request
Nov 21, 2023
by parsing correctly the output of the command `git branch --list --merged HEAD` that contains "+ " prefix in front of branch names checked out in worktrees Fixes gitextensions#11375 + makes git log command a little more resilient by appending '--' like done in gitextensions#11277
pmiossec
added a commit
to pmiossec/gitextensions
that referenced
this pull request
Nov 21, 2023
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
pmiossec
added a commit
to pmiossec/gitextensions
that referenced
this pull request
Nov 21, 2023
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
pmiossec
added a commit
to pmiossec/gitextensions
that referenced
this pull request
Nov 21, 2023
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
pmiossec
added a commit
to pmiossec/gitextensions
that referenced
this pull request
Nov 21, 2023
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
pmiossec
added a commit
to pmiossec/gitextensions
that referenced
this pull request
Nov 22, 2023
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
RussKie
pushed a commit
that referenced
this pull request
Nov 23, 2023
…#11376) 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 #11375 + makes git log command a little more resilient by appending '--' like done in #11277
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.
When trying to checkout a branch with the same name than an existing folder like 'scripts" in GitExtensions repository, git fails when running command line: git rev-list afe67a23d35300169ba539bb220be43e788dbfb0 ^scripts --count
with error:
fatal: ambiguous argument 'scripts': both revision and filename
Use '--' to separate paths from revisions, like this:
'git [...] -- [...]'
Fix: replace by command line:line
git rev-list afe67a23d35300169ba539bb220be43e788dbfb0 ^scripts --count --
Screenshots
Before
After
No error
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.