Skip to content

Prepare Git's test suite for symbolic link support on Windows

Johannes Schindelin via GitGitGadget git 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest10 patches 1 replyIn review
  2. v39 of 10 patches 3 repliesSuperseded
  3. v210 patches 2 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v110 patches19 repliesSuperseded

Changes in v4 from the cover letter

* Re-added the credits to Patrick's research that was accidentally dropped from the commit message of "t0600: fix incomplete prerequisite for a test case"

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/10t9700: accommodate for Windows pathst/t9700/test.pl+7 -20 replies
2/10apply: symbolic links lack a "trustable executable bit"apply.c+1 -10 replies
3/10mingw: special-case `open(symlink, O_CREAT | O_EXCL)`compat/mingw.c+14 -00 replies
4/10t0001: handle `diff --no-index` gracefullyt/t0001-init.sh+5 -10 replies
5/10t0301: another fix for Windows compatibilityt/t0301-credential-cache.sh+2 -10 replies
6/10t0600: fix incomplete prerequisite for a test caset/t0600-reffiles-backend.sh+1 -10 replies
7/10t1006: accommodate for symlink support in MSYS2t/t1006-cat-file.sh+17 -70 replies
8/10t1305: skip symlink tests that do not apply to Windowst/t1305-config-include.sh+2 -20 replies
9/10t6423: introduce Windows-specific handling for symlinking to /dev/nullt/t6423-merge-rename-directories.sh+7 -20 replies
10/10t7800: work around the MSYS path conversion on Windowst/t7800-difftool.sh+4 -40 replies

Reviews trailers per patch

None of the 10 patches has a Reviewed-by or Acked-by.

PatchJunio C HamanoPatrick Steinhardt
1/10
2/10
3/10
4/10Co-authored-by
5/10
6/10Helped-by
7/10
8/10
9/10
10/10

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH v4 00/10] Prepare Git's test suite for symbolic link support on Windows

Git for Windows has supported symbolic links for quite some time: In
https://github.com/git-for-windows/git/pull/156, this support was introduced already into Git for Windows v2.4.2.windows.1 in May 2015.

However, the Git for Windows CI never ran the test suite with symbolic link support because the MSYS2 runtime (i.e. the POSIX emulation layer required to run Git's test suite because the latter is written in Unix shell script) does not support symbolic links right out of the box. This is for historical
reasons: Symbolic link support was introduced in Windows 7, where these links could only be created by administrators by default, and it took until Windows 10 Build 14972 that at least in Developer Mode, non-administrators would be permitted to create them.

The MSYS2 runtime does have some sort of support for symbolic links, although with caveats: seeing as it expects the inputs as Unix-like paths, but the outputs need to be Win32 symbolic links pointing to Win32 paths, some normalization has to be performed in the process. This leads to sometimes surprising behavior e.g. when a link target like a/b/.. is normalized to a.

It has been a minute or three since the time when Windows versions without symbolic link support were common, therefore there are plans to turn on that support in the MSYS2 runtime on these Windows versions by default, see
https://github.com/msys2/msys2-runtime/pull/114 for more details about this.

To prepare for this, I am working toward upstreaming Git for Windows' own support for symbolic links. And to prepare for that, in turn, I am hereby contributing preemptively the fixes required to eventually let Git's test suite pass when both MSYS2 runtime and Git support symbolic links.

As a bonus, this patch series also contains fixes for the Perl tests (which were broken for a few years, unnoticed because the CI runs need to save on runtime and therefore skip the Perl tests because the consume a lot of time).

Changes since v3:

* Re-added the credits to Patrick's research that was accidentally dropped from the commit message of "t0600: fix incomplete prerequisite for a test case"

Changes since v2:

* Polished commit messages.

Changes since v1:

* Fixed a grammar issue.
* Using cmp rather than skipping the comparison (thanks Junio).
* Extended a commit message to explain that it covers all the cases where core.preferSymlinkRefs needs special care.

Johannes Schindelin (10):
t9700: accommodate for Windows paths
apply: symbolic links lack a "trustable executable bit"
mingw: special-case open(symlink, O_CREAT | O_EXCL)
t0001: handle diff --no-index gracefully
t0301: another fix for Windows compatibility
t0600: fix incomplete prerequisite for a test case
t1006: accommodate for symlink support in MSYS2
t1305: skip symlink tests that do not apply to Windows
t6423: introduce Windows-specific handling for symlinking to /dev/null
t7800: work around the MSYS path conversion on Windows

 apply.c                             |  2 +-
 compat/mingw.c                      | 14 ++++++++++++++
 t/t0001-init.sh                     |  6 +++++-
 t/t0301-credential-cache.sh         |  3 ++-
 t/t0600-reffiles-backend.sh         |  2 +-
 t/t1006-cat-file.sh                 | 24 +++++++++++++++++-------
 t/t1305-config-include.sh           |  4 ++--
 t/t6423-merge-rename-directories.sh |  9 +++++++--
 t/t7800-difftool.sh                 |  8 ++++----
 t/t9700/test.pl                     |  9 +++++++--
 10 files changed, 60 insertions(+), 21 deletions(-)

base-commit: 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2009%2Fdscho%2Fprepare-the-test-suite-for-symlink-support-on-windows-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2009/dscho/prepare-the-test-suite-for-symlink-support-on-windows-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/2009

Range-diff vs v3:

  1:  2d329837e3 =  1:  2d329837e3 t9700: accommodate for Windows paths
  2:  b97afa9a5c =  2:  b97afa9a5c apply: symbolic links lack a "trustable executable bit"
  3:  f42a2f14bc =  3:  f42a2f14bc mingw: special-case `open(symlink, O_CREAT | O_EXCL)`
  4:  70237394c6 =  4:  70237394c6 t0001: handle `diff --no-index` gracefully
  5:  0d371ee552 =  5:  0d371ee552 t0301: another fix for Windows compatibility
  6:  91bd72062c !  6:  7b233c2d40 t0600: fix incomplete prerequisite for a test case

@@ Commit message
However, the preferSymlinkRefs feature is not supported on Windows, therefore this test case needs the MINGW prerequisite, too.

+ There's a couple more cases where we set this config key:
+
+ - In a subsequent test in t0600, but there we explicitly set it to
+ "false". So this would naturally be supported by Windows.
+
+ - In t7201 we set the value to yes, but we never verify that the
+ written reference is a symbolic link in the first place. I guess
+ that we could rather remove setting the configuration value here, as
+ we are about to deprecate support for symrefs via symbolic links in
+ the first place. But that's certainly outside of the scope of this
+ patch.
+
+ - In t9903 we do the same, but likewise, we don't check whether the
+ written file is a symbolic link.
+
+ Therefore this seems to be the only instance where the tests actually
+ need to be adapted.
+
+ Helped-by: Patrick Steinhardt <[email protected]>

## t/t0600-reffiles-backend.sh ##

  7:  c2d3212f11 =  7:  31ed59481c t1006: accommodate for symlink support in MSYS2
  8:  03ff6d756d =  8:  37f9614ef5 t1305: skip symlink tests that do not apply to Windows
  9:  4ab6aaf2cf =  9:  e604ace822 t6423: introduce Windows-specific handling for symlinking to /dev/null
 10:  5f056902df = 10:  6caf8bf0b1 t7800: work around the MSYS path conversion on Windows
Signature · 1 line
gitgitgadget