Skip to content

mingw: special-case index entries for symlinks with buggy size #2666

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 6, 2020
Merged

mingw: special-case index entries for symlinks with buggy size #2666

merged 1 commit into from
Jun 6, 2020

Conversation

dscho
Copy link
Member

@dscho dscho commented Jun 4, 2020

Let's not mark symbolic links as modified always when upgrading to v2.27.0: we can detect that situation and simply
pretend that a symbolic link with a known bad size was just checked it out, and therefore needs to be re-checked.

This will help people who upgrade from pre-v2.27.0 versions to post-v2.27.0 versions (but unfortunately not when upgrading to v2.27.0).

Cc: @billziss-gh

@dscho
mingw: special-case index entries for symlinks with buggy size
b24ae6b 
In git-for-windows#2637, we fixed a bug
where symbolic links' target path sizes were recorded incorrectly in the
index. The downside of this fix was that every user with tracked
symbolic links in their checkouts would see them as modified in `git
status`, but not in `git diff`, and only a `git add <path>` (or `git add
-u`) would "fix" this.

Let's do better than that: we can detect that situation and simply
pretend that a symbolic link with a known bad size (or a size that just
happens to be that bad size, a _very_ unlikely scenario because it would
overflow our buffers due to the trailing NUL byte) means that it needs
to be re-checked as if we had just checked it out.

Signed-off-by: Johannes Schindelin <[email protected]>
@billziss-gh
Copy link

This looks reasonable to me.

My apologies for not looking at this issue earlier, but I have had to work on a problem in my own software.

@dscho
Copy link
Member Author

dscho commented Jun 6, 2020

This looks reasonable to me.

Thank you!

My apologies for not looking at this issue earlier, but I have had to work on a problem in my own software.

No worries at all!

@dscho dscho merged commit ba03143 into git-for-windows:master Jun 6, 2020
@dscho dscho deleted the nicer-upgrade-path-for-#2637 branch June 6, 2020 23:53
git-for-windows-ci pushed a commit that referenced this pull request Jun 6, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
5182ec2 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 6, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
1ba0d25 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 6, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
7c2a731 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 8, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
17dc3b0 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 8, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
66cfcc0 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 8, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
e707b98 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 8, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
1d77a1c 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 9, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
96e514e 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 9, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
fd97094 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 9, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
824dd0e 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 9, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
f00ef78 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 9, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
2e43ce5 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Jun 10, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
a974106 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 11, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
6203678 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Jun 11, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
4f1b46c 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 12, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
60144ec 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 12, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
8baf84d 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 16, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
d0168cd 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 16, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
625b688 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 16, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
95c03c0 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 16, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
2db1335 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Jun 18, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
08e0245 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Sep 25, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
1995cab 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Sep 25, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
b2bb3d5 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Sep 27, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
bf2e917 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Sep 27, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
da35fea 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Sep 28, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
137bc21 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Sep 28, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
755ef72 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Sep 28, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
66102ea 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Sep 29, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
f29e7bc 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Sep 29, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
5e1940c 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Sep 29, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
c17d96a 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Sep 29, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
ca93256 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Sep 29, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
22f19f8 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Sep 29, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
a27e5b9 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Sep 30, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
361b4ad 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Oct 1, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
55ce9e3 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
3e1d9c7 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
3089c54 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
5a59d5c 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
a14b3b1 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
79fa9d1 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
3eefe01 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Oct 2, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
91daa01 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Oct 4, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
658076d 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Oct 4, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
0988beb 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Oct 4, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
2d1c702 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Oct 5, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
9dbfb80 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Oct 5, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
482e96d 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Oct 5, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
5c68c5b 
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci pushed a commit that referenced this pull request Oct 5, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
88a7b5b 
mingw: special-case index entries for symlinks with buggy size
dscho added a commit that referenced this pull request Oct 6, 2020
@dscho
Merge pull request #2666 from dscho/nicer-upgrade-path-for-#2637
26ee174 
mingw: special-case index entries for symlinks with buggy size
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
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dscho @billziss-gh