Skip to content
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

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

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 <[email protected]>
@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 <[email protected]>
@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 <[email protected]>
@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
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
e9451fe 
Handle `git add <file>` where <file> traverses an NTFS junction
@dscho dscho mentioned this pull request Jan 7, 2025
Merged
dscho added a commit to dscho/git that referenced this pull request Jan 7, 2025
@dscho
Merge pull request git-for-windows#2504 from dscho/access-repo-via-ju…
fb8e894 
…nction

Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit to dscho/git that referenced this pull request Jan 7, 2025
@dscho
Merge pull request git-for-windows#2504 from dscho/access-repo-via-ju…
ced4776 
…nction

Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
c08023e 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
b5e79a3 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
827a840 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
4e095b7 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
6cbf292 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
382a94f 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Jan 9, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
37f3adf 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Jan 9, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
38d93b5 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Jan 17, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
b337de4 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Jan 27, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
7c2f750 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Jan 27, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
ff6d968 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Jan 27, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
7dec5c0 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Jan 27, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
0ff7bb3 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Jan 27, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
5257acd 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Jan 28, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
32a2d6c 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Jan 28, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
cd15960 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Feb 3, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
93308ea 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Feb 5, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
0a93ab9 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Feb 5, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
6c4bb64 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Feb 5, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
e4e7c68 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Feb 5, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
b45629e 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Feb 6, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
5ef8e24 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit that referenced this pull request Feb 6, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
6643c76 
Handle `git add <file>` where <file> traverses an NTFS junction
git-for-windows-ci pushed a commit that referenced this pull request Feb 6, 2025
@dscho
Merge pull request #2504 from dscho/access-repo-via-junction
a1d2524 
Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit to dscho/git that referenced this pull request Feb 6, 2025
@dscho
Merge pull request git-for-windows#2504 from dscho/access-repo-via-ju…
35b304f 
…nction

Handle `git add <file>` where <file> traverses an NTFS junction
dscho added a commit to dscho/git that referenced this pull request Feb 6, 2025
@dscho
Merge pull request git-for-windows#2504 from dscho/access-repo-via-ju…
fd9dd3a 
…nction

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