Skip to content

Handle git add <file> where <file> traverses an NTFS junction #2504

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 3 commits into from
Feb 1, 2020
Merged

Handle git add <file> where <file> traverses an NTFS junction #2504

merged 3 commits into from
Feb 1, 2020

Conversation

dscho
Copy link
Member

@dscho dscho commented Jan 31, 2020

This is intended to fix #2481

dscho added 2 commits January 31, 2020 12:58
@dscho
mingw: demonstrate a git add issue with NTFS junctions
d50f290 
NTFS junctions are somewhat similar in spirit to Unix bind mounts: they
point to a different directory and are resolved by the filesystem
driver. As such, they appear to `lstat()` as if they are directories,
not as if they are symbolic links.

_Any_ user can create junctions, while symbolic links can only be
created by non-administrators in Developer Mode on Windows 10. Hence
NTFS junctions are much more common "in the wild" than NTFS symbolic
links.

It was reported in git-for-windows#2481
that adding files via an absolute path that traverses an NTFS junction:
since 1e64d18 (mingw: do resolve symlinks in `getcwd()`), we resolve not
only symbolic links but also NTFS junctions when determining the
absolute path of the current directory. The same is not true for `git
add <file>`, where symbolic links are resolved in `<file>`, but not NTFS
junctions.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
strbuf_realpath(): use platform-dependent API if available
2f7720c 
Some platforms (e.g. Windows) provide API functions to resolve paths
much quicker. Let's offer a way to short-cut `strbuf_realpath()` on
those platforms.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho added this to the Next release milestone Jan 31, 2020
@dscho
mingw: implement a platform-specific strbuf_realpath()
100d194 
There is a Win32 API function to resolve symbolic links, and we can use
that instead of resolving them manually. Even better, this function also
resolves NTFS junction points (which are somewhat similar to bind
mounts).

This fixes git-for-windows#2481.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho force-pushed the access-repo-via-junction branch from 4e017d2 to 100d194 Compare January 31, 2020 15:36
@dscho dscho requested review from drizzd, kgybels and orgads January 31, 2020 21:14
drizzd
drizzd approved these changes Jan 31, 2020
View reviewed changes
Copy link

@drizzd drizzd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@dscho dscho merged commit 89a5bbf into git-for-windows:master Feb 1, 2020
@dscho dscho deleted the access-repo-via-junction branch February 1, 2020 11:13
@dscho
Copy link
Member Author

dscho commented Feb 1, 2020

Thanks @drizzd!

git-for-windows-ci pushed a commit that referenced this pull request Feb 1, 2020
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
f372dd1 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Feb 1, 2020
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
e416881 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Feb 1, 2020
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
3fce0d4 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Feb 1, 2020
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
152d381 
Handle `git add <file>` where <file> traverses an NTFS junction
@weekly-digest weekly-digest bot mentioned this pull request Feb 2, 2020
Closed
git-for-windows-ci pushed a commit that referenced this pull request Feb 5, 2020
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
abcb3fb 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Feb 5, 2020
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
798d618 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Feb 5, 2020
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
ba500d3 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Feb 6, 2020
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
e83cfdd 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Feb 10, 2020
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
062b3f3 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Apr 30, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
34adb8b 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Apr 30, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
f439669 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Apr 30, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
935e959 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Apr 30, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
332aad6 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Apr 30, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
527c3ed 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Apr 30, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
7e276af 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request May 1, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
c6caef4 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request May 1, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
b07af8f 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 1, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
c827261 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 1, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
a3f14ea 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 1, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
bae155a 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 3, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
cea5157 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 6, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
366d486 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 6, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
90e92e8 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 8, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
8672eeb 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request May 8, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
5cb9d52 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request May 8, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
0b2debe 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 8, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
24247e3 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 8, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
329965c 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 8, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
9c2c088 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 9, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
b5c3821 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 9, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
b4807ee 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 9, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
006b2d3 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 12, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
a3c6ccc 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 13, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
48ab4b7 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request May 14, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
819318c 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 14, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
713e436 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 14, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
33cd62d 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 15, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
89570d1 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request May 16, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
cce40d0 
Handle `git add <file>` where <file> traverses an NTFS junction
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drizzd drizzd drizzd approved these changes

@kgybels kgybels Awaiting requested review from kgybels

@orgads orgads Awaiting requested review from orgads

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.25.1
Development

Successfully merging this pull request may close these issues.

Git cannot stage full-path files if the path to the repository is a directory junction
2 participants
@dscho @drizzd