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

revert change to ignore_skip_worktree in git checkout and git restore #674

Merged
merged 1 commit into from
Jul 12, 2024

Conversation

derrickstolee
Copy link

@derrickstolee derrickstolee commented Jul 12, 2024

This reverts #658 and essentially reopens microsoft/VFSForGit#1812. Resolves #673.

The issue is that by overriding the ignore_skip_wortree value (normally set by --ignore-skip-worktree) we then force Git to hydrate the entire working directory in a git restore .. This leads to some interesting trade-offs:

  1. Users on v2.45.2.vfs.0.2 (where git restore . overhydrates), they can use git reset --hard as a better representation of this behavior.
  2. Users on any Git version can use git restore --ignore-skip-worktree -- <pathspec> when using a smaller-scale pathspec that corresponds to files they care about and probably have hydrated.

I will include these workarounds in the VFS for Git issue.

To get to a real solution here, we would somehow need to turn the ignore_skip_worktree bit into two bits:

a. A bit to say "update index entries that have SKIP_WORKTREE set".
b. A bit to say "update the working directory even if SKIP_WORKTREE is set".

And perhaps this "working directory" version is what was intended when adding the --ignore-skip-worktree option, but it's more involved and has upstream implications to make changes here.

@derrickstolee derrickstolee requested a review from dscho July 12, 2024 19:05
@derrickstolee derrickstolee self-assigned this Jul 12, 2024
Copy link
Member

@dscho dscho left a comment

Choose a reason for hiding this comment

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

Makes sense. It's sad that we cannot keep the VFS for Git bug fix, but the regression is too bad not to revert. Thank you for diagnosing this so thoroughly and fixing it!

@dscho dscho enabled auto-merge July 12, 2024 19:33
@dscho dscho merged commit bff505b into microsoft:vfs-2.45.2 Jul 12, 2024
48 checks passed
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.

v2.45.2.vfs.0.2: performance regression in pathspec checkouts
2 participants