Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect by dscho · Pull Request #2673 · git-for-windows/git

dscho · 2020-06-07T20:42:52Z

This fixes #2653

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>

billziss-gh · 2020-06-07T22:32:56Z

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 · 2020-06-08T05:16:35Z

Works for me too. Thank you!

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

This was referenced Jun 7, 2020

mingw: lstat: compute correct size for symlinks #2637

Merged

As of 2.27.0, all symlinks have modifications after stash pop #2653

Closed

dscho merged commit 4df0b59 into git-for-windows:master Jun 8, 2020

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

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 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

dscho added a commit that referenced this pull request Jun 23, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

055f8ec

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 25, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

44aa11b

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 25, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

b9b8579

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 26, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

1bce7a3

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 27, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

a79fe6e

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 29, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

7cc2dae

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 30, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

d19a7f8

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

dscho added a commit that referenced this pull request Jun 30, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

209cabe

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 Jul 2, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

a20f232

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 Jul 2, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

80defa2

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

dscho added a commit that referenced this pull request Jul 2, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

caebeb1

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

dscho added a commit that referenced this pull request Jul 2, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

303cc7a

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 Jul 3, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

e03a978

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 Jul 3, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

5a25b38

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 Jul 3, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

b9df620

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 Jul 3, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

53d4634

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 Jul 7, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

5cc0b60

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 Jul 7, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

c79c1fa

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 Jul 7, 2020

Merge pull request #2673 from dscho/also-handle-fscache-addon-for-#2637

d4bdc88

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

Fix `lstat()`'s `st_size` computation for symbolic links when FSCache is in effect#2673
dscho merged 1 commit into
git-for-windows:masterfrom
dscho:also-handle-fscache-addon-for-#2637

dscho commented Jun 7, 2020

Uh oh!

billziss-gh commented Jun 7, 2020

Uh oh!

orgads commented Jun 8, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

dscho commented Jun 7, 2020

Uh oh!

billziss-gh commented Jun 7, 2020

Uh oh!

orgads commented Jun 8, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants