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
t0001: handle diff --no-index gracefully 
The test case 're-init to move gitdir symlink' wants to compare the
contents of `newdir/.git`, which is a symbolic link pointing to a file.
However, `git diff --no-index`, which is used by `test_cmp` on Windows,
does not resolve symlinks; It shows the symlink _target_ instead (with a
file mode of 120000). That is totally unexpected by the test case, which
as a consequence fails, meaning that it's a bug in the test case itself.

Co-authored-by: Junio C Hamano <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
@dscho @gitster
dscho and gitster committed Dec 5, 2025
commit 60189b5a4af93b5db95027fedca133a7416cf64b
6 changes: 5 additions & 1 deletion t/t0001-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,11 @@ test_expect_success SYMLINKS 're-init to move gitdir symlink' '
git init --separate-git-dir ../realgitdir
) &&
echo "gitdir: $(pwd)/realgitdir" >expected &&
test_cmp expected newdir/.git &&
case "$GIT_TEST_CMP" in
# `git diff --no-index` does not resolve symlinks
*--no-index*) cmp expected newdir/.git;;
*) test_cmp expected newdir/.git;;
esac &&
test_cmp expected newdir/here &&
test_path_is_dir realgitdir/refs
'
Expand Down