Skip to content

Fix lstat()'s st_size computation for symbolic links when FSCache is in effect #2673

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jun 8, 2020
Merged

Fix lstat()'s st_size computation for symbolic links when FSCache is in effect #2673

merged 1 commit into from
Jun 8, 2020

Conversation

dscho
Copy link
Member

@dscho dscho commented Jun 7, 2020

This fixes #2653

@dscho
fscache: compute correct symlink size in lstat()
aeb9254 
In git-for-windows#2637, we fixed a bug
where symbolic links' target path sizes were recorded incorrectly in the
index.

However, we did so only in `mingw_lstat()` but not in `fscache_lstat()`.
Meaning: in code paths where the FSCache feature is enabled, Git _still_
got the wrong idea if the symbolic link target's length.

Let's fix this.

Note: as the FSCache feature reads in whole swaths of directory entries
in batch mode, even if metadata for only one of them might be required,
we save the expensive `CreateFile()` call that is required to compute
the symbolic link target's length to the `fscache_lstat()` call.

This fixes git-for-windows#2653.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This was referenced Jun 7, 2020
Merged
Closed
@billziss-gh
Copy link

Looks good to me.

See test run below:

billziss@xps:~/Projects/ext/dscho-git$ uname -a
MINGW64_NT-10.0-19041 xps 3.1.4-340.x86_64 2020-05-19 12:55 UTC x86_64 Msys
billziss@xps:~/Projects/ext/dscho-git$ ./git.exe config core.fscache
true
billziss@xps:~/Projects/ext/dscho-git$ ./git.exe status
On branch also-handle-fscache-addon-for-#2637
Your branch is up to date with 'origin/also-handle-fscache-addon-for-#2637'.

nothing to commit, working tree clean

I have also confirmed that if I copy the git.exe produced from your patch into \Program Files\Git, it fixes the problem on all repositories.

Thank you for the quick fix!

@orgads
Copy link

orgads commented Jun 8, 2020

Works for me too. Thank you!

@dscho dscho merged commit 4df0b59 into git-for-windows:master Jun 8, 2020
@dscho dscho added this to the Next release milestone Jun 8, 2020
git-for-windows-ci pushed a commit that referenced this pull request Jun 8, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
7b7975d 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
@dscho dscho deleted the also-handle-fscache-addon-for-#2637 branch June 8, 2020 05:38
git-for-windows-ci pushed a commit that referenced this pull request Jun 8, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
2f73a31 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 8, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
6895308 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 8, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
ce08d04 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 9, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
976d563 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 9, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
56517b4 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 9, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
af53b40 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 9, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
6eb4b56 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 9, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
2c588f6 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Jun 10, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
a32ba99 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 11, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
df272cd 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Jun 11, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
42fa228 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 12, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
20929f6 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 12, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
f51a122 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 16, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
da57536 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 16, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
4d826c7 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 16, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
d7a64c4 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 16, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
ae58b8e 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Jun 18, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
4f5168a 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Sep 25, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
a24e103 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Sep 25, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
38fcf37 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Sep 27, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
80f7aef 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Sep 27, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
b372759 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Sep 28, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
b9afb1f 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Sep 28, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
aa1f25d 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Sep 28, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
f4469ca 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Sep 29, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
ba6923e 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Sep 29, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
84a74fd 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Sep 29, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
61a26f5 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Sep 29, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
ae7e5a1 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Sep 29, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
6f873ed 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Sep 29, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
beb0029 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Sep 30, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
fae4bf1 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Oct 1, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
7d2b3c9 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
1af18f3 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
b3d93fe 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
3dd4d1b 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
a5bad7d 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
788da26 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
355650f 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
1b2c9fb 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Oct 4, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
0f18e08 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Oct 4, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
69e7486 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Oct 4, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
37d2c59 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Oct 5, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
bf719bf 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Oct 5, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
9db1338 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Oct 5, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
d82a8e0 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
git-for-windows-ci pushed a commit that referenced this pull request Oct 5, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
3d0cf59 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
dscho added a commit that referenced this pull request Oct 6, 2020
@dscho
Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637
a25c96b 
Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.28.0
Development

Successfully merging this pull request may close these issues.

As of 2.27.0, all symlinks have modifications after stash pop
3 participants
@dscho @billziss-gh @orgads