Skip to content
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

Allow bootstrap update on git worktree checkouts #2071

Merged
merged 4 commits into from
Apr 12, 2022

Conversation

ndevenish
Copy link
Member

These have a .git in the root repository folder that is a file pointing to the real checkout. Rather than try and work out what to do, just assume that the user knows what they are doing in this scenario.

ndevenish and others added 2 commits April 11, 2022 16:25
These have a .git folder entry that is a pointer to the real checkout. Rather
than try and work out what to do, just assume that the user knows what they
are doing in this scenario.
Copy link
Member

@Anthchirp Anthchirp left a comment

Choose a reason for hiding this comment

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

Sensible, although the message is a bit misleading then

@ndevenish
Copy link
Member Author

Okay, so I fixed the message, with the assumption that if you have a .git file then that's what is going on - if you have a non-worktree git checkout where the .git file exists then I guess you'll have to live with the confusion 🤷

I've also fixed precommitbx which also fell over on the same situation.

@ndevenish ndevenish merged commit 4253028 into dials:main Apr 12, 2022
@ndevenish ndevenish deleted the worktree branch April 12, 2022 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants