mingw: special-case index entries for symlinks with buggy size#2666
Merged
Conversation
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 <johannes.schindelin@gmx.de>
|
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. |
Member
Author
Thank you!
No worries at all! |
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 6, 2020
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
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
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
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
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
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
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
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
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
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
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
mingw: special-case index entries for symlinks with buggy size
dscho
added a commit
that referenced
this pull request
Jun 10, 2020
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
mingw: special-case index entries for symlinks with buggy size
dscho
added a commit
that referenced
this pull request
Jun 11, 2020
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
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
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
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
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
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
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
mingw: special-case index entries for symlinks with buggy size
dscho
added a commit
that referenced
this pull request
Jun 22, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 23, 2020
mingw: special-case index entries for symlinks with buggy size
dscho
added a commit
that referenced
this pull request
Jun 23, 2020
mingw: special-case index entries for symlinks with buggy size
dscho
added a commit
that referenced
this pull request
Jun 23, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 25, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 25, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 26, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 27, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 29, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jun 30, 2020
mingw: special-case index entries for symlinks with buggy size
dscho
added a commit
that referenced
this pull request
Jun 30, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jul 2, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jul 2, 2020
mingw: special-case index entries for symlinks with buggy size
dscho
added a commit
that referenced
this pull request
Jul 2, 2020
mingw: special-case index entries for symlinks with buggy size
dscho
added a commit
that referenced
this pull request
Jul 2, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jul 3, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jul 3, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jul 3, 2020
mingw: special-case index entries for symlinks with buggy size
git-for-windows-ci
pushed a commit
that referenced
this pull request
Jul 3, 2020
mingw: special-case index entries for symlinks with buggy size
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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