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

Specify symlink type in .gitattributes #1897

Merged
merged 3 commits into from
Oct 31, 2018
Merged

Specify symlink type in .gitattributes #1897

merged 3 commits into from
Oct 31, 2018

Conversation

piscisaureus
Copy link

On Windows, symbolic links have a type: a "file symlink" must point at
a file, and a "directory symlink" must point at a directory. If the
type of symlink does not match its target, it doesn't work.

Git does not record the type of symlink in the index or in a tree. On
checkout it'll guess the type, which only works if the target exists
at the time the symlink is created. This may often not be the case,
for example when the link points at a directory inside a submodule.

By specifying symlink=file or symlink=dir the user can specify what
type of symlink Git should create, so Git doesn't have to rely on
unreliable heuristics.

dscho
dscho requested changes Oct 29, 2018
View reviewed changes
Copy link
Member

@dscho dscho left a comment

Choose a reason for hiding this comment

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

This looks pretty awesome already, and I like this idea of specifying the symlink type via the Git attributes! I offered a couple of suggestions how to change this, hopefully you agree that those are improvements?

compat/mingw.c Outdated Show resolved Hide resolved
t/t2040-checkout-symlink-attr.sh

# Tell MSYS to create native symlinks. Without this flag test-lib's
# prerequisite detection for SYMLINKS doesn't detect the right thing.
MSYS=winsymlinks:nativestrict && export MSYS

This comment was marked as off-topic.

Sign in to view

t/t2040-checkout-symlink-attr.sh Outdated Show resolved Hide resolved
t/t2040-checkout-symlink-attr.sh Outdated Show resolved Hide resolved
t/t2040-checkout-symlink-attr.sh Outdated Show resolved Hide resolved
t/t2040-checkout-symlink-attr.sh Show resolved Hide resolved
@piscisaureus
Win32: symlink: specify symlink type in .gitattributes
d577c4d 
On Windows, symbolic links have a type: a "file symlink" must point at
a file, and a "directory symlink" must point at a directory. If the
type of symlink does not match its target, it doesn't work.

Git does not record the type of symlink in the index or in a tree. On
checkout it'll guess the type, which only works if the target exists
at the time the symlink is created. This may often not be the case,
for example when the link points at a directory inside a submodule.

By specifying `symlink=file` or `symlink=dir` the user can specify what
type of symlink Git should create, so Git doesn't have to rely on
unreliable heuristics.

Signed-off-by: Bert Belder <[email protected]>
@piscisaureus
Copy link
Author

@dscho Thanks for the review. I've updated the patch, PTAL.

@dscho dscho merged commit 25a7f44 into git-for-windows:master Oct 31, 2018
@dscho
Copy link
Member

dscho commented Oct 31, 2018

Excellent. Thank you so much!

dscho added a commit to git-for-windows/build-extra that referenced this pull request Oct 31, 2018
@dscho
Mention New Feature in release notes
b391896 
The type of symlinks to create (directory
or file) [can now be specified via the
`.gitattributes`](git-for-windows/git#1897).

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho added this to the v2.19.1(2) milestone Oct 31, 2018
dscho added a commit to dscho/git that referenced this pull request Nov 19, 2018
@dscho
Merge pull request git-for-windows#1897 from piscisaureus/symlink-attr
067d416 
Specify symlink type in .gitattributes
dscho added a commit to dscho/git that referenced this pull request Nov 19, 2018
@dscho
Merge pull request git-for-windows#1897 from piscisaureus/symlink-attr
76163fa 
Specify symlink type in .gitattributes
dscho added a commit to dscho/git that referenced this pull request Nov 20, 2018
@dscho
Merge pull request git-for-windows#1897 from piscisaureus/symlink-attr
43cd305 
Specify symlink type in .gitattributes
dscho added a commit to dscho/git that referenced this pull request Nov 20, 2018
@dscho
Merge pull request git-for-windows#1897 from piscisaureus/symlink-attr
ecce915 
Specify symlink type in .gitattributes
dscho added a commit that referenced this pull request Nov 21, 2018
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
f772518 
Specify symlink type in .gitattributes
dscho added a commit that referenced this pull request Nov 21, 2018
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
bde3696 
Specify symlink type in .gitattributes
dscho added a commit to dscho/git that referenced this pull request Nov 23, 2018
@dscho
Merge pull request git-for-windows#1897 from piscisaureus/symlink-attr
8641d4f 
Specify symlink type in .gitattributes
dscho added a commit to dscho/git that referenced this pull request Nov 23, 2018
@dscho
Merge pull request git-for-windows#1897 from piscisaureus/symlink-attr
d8895f5 
Specify symlink type in .gitattributes
@weekly-digest weekly-digest bot mentioned this pull request Nov 25, 2018
Closed
dscho added a commit to dscho/git that referenced this pull request Nov 30, 2018
@dscho
Merge pull request git-for-windows#1897 from piscisaureus/symlink-attr
e22fb77 
Specify symlink type in .gitattributes
dscho added a commit to dscho/git that referenced this pull request Nov 30, 2018
@dscho
Merge pull request git-for-windows#1897 from piscisaureus/symlink-attr
ed46209 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
cc8788d 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
456a88d 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
02a86b4 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 2, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
0cea859 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 2, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
38f8594 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 2, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
577039d 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 3, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
8701643 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 6, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
0cb91ec 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 6, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
1af5d1f 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
4770abf 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
8aa0252 
Specify symlink type in .gitattributes
@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#1897 from piscisaureus/symlink-attr
6bf1248 
Specify symlink type in .gitattributes
dscho added a commit to dscho/git that referenced this pull request Jan 7, 2025
@dscho
Merge pull request git-for-windows#1897 from piscisaureus/symlink-attr
8e1685e 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
f2a7b1d 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
27f5f84 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
6658ad9 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
d90125c 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
3dd5b1f 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
7abfbce 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 9, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
1df9416 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 9, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
2ca323a 
Specify symlink type in .gitattributes
dscho added a commit that referenced this pull request Jan 17, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
bdbe803 
Specify symlink type in .gitattributes
dscho added a commit that referenced this pull request Jan 27, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
4e7641a 
Specify symlink type in .gitattributes
dscho added a commit that referenced this pull request Jan 27, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
50a4944 
Specify symlink type in .gitattributes
dscho added a commit that referenced this pull request Jan 27, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
55315e8 
Specify symlink type in .gitattributes
dscho added a commit that referenced this pull request Jan 27, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
fcdcd92 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 27, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
18fb5aa 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 28, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
06d3f32 
Specify symlink type in .gitattributes
git-for-windows-ci pushed a commit that referenced this pull request Jan 28, 2025
@dscho
Merge pull request #1897 from piscisaureus/symlink-attr
2ea6c36 
Specify symlink type in .gitattributes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dscho dscho dscho approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@piscisaureus @dscho @mstyura