Skip to content

Last preparations before upstreaming Git for Windows' symlink support #2017

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

Open
dscho wants to merge 15 commits into
base: js/test-symlink-windows
Choose a base branch
from
Open

Last preparations before upstreaming Git for Windows' symlink support #2017

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
53b99c0
t9700: accommodate for Windows paths
dscho Dec 5, 2025
b4c97e5
apply: symbolic links lack a "trustable executable bit"
dscho Dec 5, 2025
f08fcf7
mingw: special-case `open(symlink, O_CREAT | O_EXCL)`
dscho Dec 5, 2025
60189b5
t0001: handle `diff --no-index` gracefully
dscho Dec 5, 2025
04c2f10
t0301: another fix for Windows compatibility
dscho Dec 5, 2025
37dd867
t0600: fix incomplete prerequisite for a test case
dscho Dec 5, 2025
96a699b
t1006: accommodate for symlink support in MSYS2
dscho Dec 5, 2025
4a59267
t1305: skip symlink tests that do not apply to Windows
dscho Dec 5, 2025
051face
t6423: introduce Windows-specific handling for symlinking to /dev/null
dscho Dec 5, 2025
77dfd22
t7800: work around the MSYS path conversion on Windows
dscho Dec 5, 2025
1928738
mingw: do resolve symlinks in `getcwd()`
dscho Jan 1, 2020
31497b0
init: do parse _all_ core.* settings early
dscho Sep 8, 2021
dba2810
strbuf_readlink(): avoid calling `readlink()` twice in corner-cases
kblees May 11, 2015
db1feb2
strbuf_readlink(): support link targets that exceed PATH_MAX
kblees May 11, 2015
3521180
trim_last_path_component(): avoid hard-coding the directory separator
kblees May 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
t1006: accommodate for symlink support in MSYS2 
The MSYS2 runtime (which inherits this trait from the Cygwin runtime,
and which is used by Git for Windows' Bash to emulate POSIX
functionality on Windows, the same Bash that is also used to run Git's
test suite on Windows) has a mode where it can create native symbolic
links on Windows.

Naturally, this is a bit of a strange feature, given that Cygwin goes
out of its way to support Unix-like paths even if no Win32 program
understands those, and the symbolic links have to use Win32 paths
instead (which Win32 programs understand very well).

As a consequence, the symbolic link targets get normalized before the
links are created.

This results in certain quirks that Git's test suite is ill equipped to
accommodate (because Git's test suite expects to be able to use
Unix-like paths even on Windows).

The test script t1006-cat-file.sh contains two prime examples, two test
cases that need to skip a couple assertions because they are simply
wrong in the context of Git for Windows.

Signed-off-by: Johannes Schindelin <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
@dscho @gitster
dscho authored and gitster committed Dec 5, 2025
commit 96a699be0fd32b4e8b457bcbbc89139773ffbc9d
24 changes: 17 additions & 7 deletions t/t1006-cat-file.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,18 +1048,28 @@ test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-
echo .. >>expect &&
echo HEAD:dir/subdir/out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks >actual &&
test_cmp expect actual &&
echo symlink 3 >expect &&
echo ../ >>expect &&
if test_have_prereq MINGW,SYMLINKS
then
test_write_lines "symlink 2" ..
else
test_write_lines "symlink 3" ../
fi >expect &&
echo HEAD:dir/subdir/out-of-repo-link-dir-trailing | git cat-file --batch-check --follow-symlinks >actual &&
test_cmp expect actual
'

test_expect_success 'git cat-file --batch-check --follow-symlinks works for symlinks with internal ..' '
echo HEAD: | git cat-file --batch-check >expect &&
echo HEAD:up-down | git cat-file --batch-check --follow-symlinks >actual &&
test_cmp expect actual &&
echo HEAD:up-down-trailing | git cat-file --batch-check --follow-symlinks >actual &&
test_cmp expect actual &&
if test_have_prereq !MINGW
then
# The `up-down` and `up-down-trailing` symlinks are normalized
# in MSYS in `winsymlinks` mode and are therefore in a
# different shape than Git expects them.
echo HEAD: | git cat-file --batch-check >expect &&
echo HEAD:up-down | git cat-file --batch-check --follow-symlinks >actual &&
test_cmp expect actual &&
echo HEAD:up-down-trailing | git cat-file --batch-check --follow-symlinks >actual &&
test_cmp expect actual
fi &&
echo HEAD:up-down-file | git cat-file --batch-check --follow-symlinks >actual &&
test_cmp found actual &&
echo symlink 7 >expect &&
Expand Down