Support windows container.

[ZCube]

Ignore symbolic link checks for Windows Container Docker

• prevent '/ContainerMappedDirectories/': No such file or directory
  Copy and remove file. MoveFile has problem
• unable to write symref for HEAD: Permission denied
• etc....

related issue : #1007

Signed-off-by: ZCube [email protected]

[dscho]

This looks really good! Thank you!

I would like to ask for a few minor changes before merging:

• could you add a "Signed-off-by:" line using your real name to the commit message? Git for Windows is a friendly fork of https://github.com/git/git and we want to contribute back all our commits eventually, and they require that sign-off.

• I would suggest to refactor the code to detect whether we are running in a Windows container into a function is_inside_windows_container() in compat/mingw.c that stores the result in a static int inside_container that gets initialized only once, upon demand. We will need to call this function at least in two locations, I think.

• it would be better to not even report the "ContainerMappedDirectories" as symbolic link. To do this, the signature of file_attr_to_st_mode() needs to be extended to receive the full path, too, and the function needs to be moved from compat/win32.h to compat/mingw.c. Then we can test is_running_in_windows_container() when we detect a reparse point, and look whether it points at that ContainerMappedDirectories, and if that is the case, simply switch to S_IFDIR instead.

• it seems that the work-around for the failed rename() needs to be guarded at least behind a if (gle == ERROR_ACCESS_DENIED && is_running_in_windows_container())? (The exact error code might be a different one, of course, could you test?)

With these changes, I will be super happy to merge this and finally fix #1007. Thank you very much!

[ZCube]

I modified the source code.
This looks better.
Need I change my git account to real name?
BusyBox version needed.

Windows 10 Pro

Microsoft Windows [Version 10.0.14393]
(c) 2016 Microsoft Corporation. All rights reserved.

V:\>ver

Microsoft Windows [Version 10.0.14393]

V:\>

Before this PR

C:\code>dir \
 Volume in drive C has no label.
 Volume Serial Number is 047C-45B9

 Directory of C:\

04/22/2018  05:20 PM    <SYMLINKD>     code [\\?\ContainerMappedDirectories\647A5395-BFFF-418E-956E-1059CB896EFA]
04/23/2018  10:07 PM    <DIR>          Git
11/23/2016  07:45 AM             1,894 License.txt
03/05/2018  04:42 AM    <DIR>          PerfLogs
03/05/2018  04:53 AM    <DIR>          Program Files
07/16/2016  10:18 PM    <DIR>          Program Files (x86)
03/05/2018  04:54 AM    <DIR>          Users
03/05/2018  04:52 AM    <DIR>          Windows
               1 File(s)          1,894 bytes
               7 Dir(s)  128,406,323,200 bytes free

C:\code>git init
fatal: Invalid path '/ContainerMappedDirectories': No such file or directory

C:\code>v:

V:\>dir
 Volume in drive V is 1TB
 Volume Serial Number is 8A15-5E5F

 Directory of V:\

04/23/2018  10:05 PM    <DIR>          .
04/23/2018  10:05 PM    <DIR>          ..
               0 File(s)              0 bytes
               2 Dir(s)  92,483,219,456 bytes free

V:\>git init
Rename from 'V:/.git/HEAD.lock' to 'V:/.git/HEAD' failed. Should I try again? (y/n) n
error: unable to write symref for HEAD: Permission denied

After this PR

C:\code>cd test

C:\code\test>git clone https://github.com/githubtraining/example-dependency --recursive
Cloning into 'example-dependency'...
remote: Counting objects: 39, done.
remote: Total 39 (delta 0), reused 0 (delta 0), pack-reused 39
Unpacking objects: 100% (39/39), done.
Submodule 'js' (https://github.com/githubtraining/example-submodule.git) registered for path 'js'
Cloning into 'C:/code/test/example-dependency/js'...
remote: Counting objects: 18, done.
remote: Total 18 (delta 0), reused 0 (delta 0), pack-reused 18
Submodule path 'js': checked out 'c3c588713233609f5bbbb2d9e7f3fb4a660f3f72'

C:\code\test>dir
 Volume in drive C has no label.
 Volume Serial Number is 047C-45B9

 Directory of C:\code\test

04/23/2018  10:07 PM    <DIR>          .
04/23/2018  10:07 PM    <DIR>          ..
04/23/2018  10:07 PM    <DIR>          example-dependency
               0 File(s)              0 bytes
               3 Dir(s)  92,314,771,456 bytes free

C:\code\test>v:

V:\test>git clone https://github.com/githubtraining/example-dependency --recursive example-dependency2
Cloning into 'example-dependency2'...
remote: Counting objects: 39, done.
remote: Total 39 (delta 0), reused 0 (delta 0), pack-reused 39
Unpacking objects: 100% (39/39), done.
Submodule 'js' (https://github.com/githubtraining/example-submodule.git) registered for path 'js'
Cloning into 'V:/test/example-dependency2/js'...
remote: Counting objects: 18, done.
remote: Total 18 (delta 0), reused 0 (delta 0), pack-reused 18
Submodule path 'js': checked out 'c3c588713233609f5bbbb2d9e7f3fb4a660f3f72'

V:\test>dir
 Volume in drive V is 1TB
 Volume Serial Number is 8A15-5E5F

 Directory of V:\test

04/23/2018  10:09 PM    <DIR>          .
04/23/2018  10:09 PM    <DIR>          ..
04/23/2018  10:07 PM    <DIR>          example-dependency
04/23/2018  10:09 PM    <DIR>          example-dependency2
               0 File(s)              0 bytes
               4 Dir(s)  92,281,122,816 bytes free

V:\test>

[dscho]

I fear that the code in this patch disables all symbolic links, not just bogus ones that correspond to Docker volumes.

To fix that, I added that parameter to the signature of file_attr_to_st_mode() as I hinted earlier, and I also used the opportunity to split the patch into nice, modular commits, then pushed the result out as branch support-windows-container to https://github.com/dscho/git.

Would you mind testing that branch?

[ZCube]

It works with some modifications.

https://github.com/dscho/git/blob/46b62580eae7812041ddd93249c566a46b2acc47/compat/mingw.c#L2485

• mingw_unlink->!mingw_unlink

https://github.com/dscho/git/blob/46b62580eae7812041ddd93249c566a46b2acc47/compat/mingw.c#L3602

• \\?\ContainerMappedDirectories\-> /ContainerMappedDirectories/

Are there any additional considerations when copying files?

[dscho]

@ZCube nice! So: can you make those modifications, squash them into the appropriate commits (using git commit --fixup <commit> and eventually git rebase -i --autosquash <git-for-windows/master>), then force-push the result to your master (which updates this PR automatically)?

Are there any additional considerations when copying files?

I do not think so. In any case, I think we can run with this for now, and if more problems raise their heads, we can try to fix them as they arise.

[ZCube]

I already did it. :) git rebase is too difficult for me... 2018년 4월 24일 (화) 오후 9:02, Johannes Schindelin <[email protected]>님이 작성:

…

@ZCube <https://github.com/ZCube> nice! So: can you make those modifications, squash them into the appropriate commits (using git commit --fixup <commit> and eventually git rebase -i --autosquash <git-for-windows/master>), then force-push the result to your master (which updates this PR automatically)? Are there any additional considerations when copying files? I do not think so. In any case, I think we can run with this for now, and if more problems raise their heads, we can try to fix them as they arise. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1645 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAvrqZhIvBTEgZTwWf9UHhwAmY7fke0Bks5trxRRgaJpZM4Te0AA> .

[dscho]

I already did it. :)

Excellent!

git rebase is too difficult for me...

From what I can see, you did it brilliantly.

Thank you so much for your contribution!