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 "reset.c: enable fscache" #1445

Closed

Conversation

atetubou
Copy link

@atetubou atetubou commented Jan 21, 2018

This reverts commit fcba80a.
Usinsg fscache for reset broke git worktree, git stash. #1437 #1440

Signed-off-by: Takuto Ikuta [email protected]

This reverts commit fcba80a.
Usinsg fscache for reset broke git worktree, git stash.

Signed-off-by: Takuto Ikuta <[email protected]>
@csware
Copy link

csware commented Jan 21, 2018

Suppose issue #1442 and #1438 and #1443 are also related.

@atetubou
Copy link
Author

@csware Yes, those are similar issue.
Broken is caused by different commit, I made fix PR separately #1443 .

@dscho
Copy link
Member

dscho commented Jan 22, 2018

I re-did this patch with more information and marked up as a fixup! commit. The test suite is still running, but once it passes, I will release Git for Windows v2.16.1 (Cc: @shiftkey).

dscho added a commit that referenced this pull request Jan 22, 2018
The recent speedup to `git reset` sadly broke things, as the cached stat
data is no longer accurate after writing the file(s). And that is exactly
what `git reset` does: writing the file(s).

This patch is identical to the one provided in
#1445 but added a bit more
detailed information, as well as marking it as a fixup so that the next
merging-rebase will drop the patch altogether.

This fixes #1437 and
#1440.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho added this to the v2.16.0(3) milestone Jan 22, 2018
@dscho
Copy link
Member

dscho commented Jan 22, 2018

As mentioned a couple of minutes ago, I re-did this revert to include more information.

Please note that I am still very much interested in a speedup by introducing fscache into this code path! I just think we have to be a bit more careful how we update the stat data.

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.

3 participants