Skip to content

Properly disambiguate between branch or file checkout#199

Merged
stefanzweifel merged 2 commits intostefanzweifel:masterfrom
kenodegard:disambiguate
Jan 12, 2022
Merged

Properly disambiguate between branch or file checkout#199
stefanzweifel merged 2 commits intostefanzweifel:masterfrom
kenodegard:disambiguate

Conversation

@kenodegard
Copy link
Copy Markdown
Contributor

This fixes the case for where a repo contains a directory/file that happens to be the same as the branch name and git checkout is unable to properly disambiguate and needs extra help.

The issue is fully outlined here: https://stackoverflow.com/a/60875971

Copy link
Copy Markdown
Owner

@stefanzweifel stefanzweifel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR!
I've added a test case based on the example on the StackOverflow question.

@stefanzweifel stefanzweifel merged commit 5804e42 into stefanzweifel:master Jan 12, 2022
@kenodegard kenodegard deleted the disambiguate branch January 12, 2022 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants