From c381a2149082397b07eaf4b96ff67375d2aab159 Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Fri, 16 Jan 2026 20:39:44 +0000 Subject: [PATCH] t9700/test.pl: fix path type expectation on cygwin Commit 4ec7ac101b ("t9700: accommodate for Windows paths", 2025-12-17) changed the type of the absolute path to the git directory from unix to win32 for both GfW and cygwin. This fixed the test for GfW but causes new failures on cygwin, since the test expectation is that it uses unix paths on cygwin. In order to not break cygwin, disable the new code by removing the "or $^O eq 'cygwin'" sub-expression from the conditional part of the fix. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano --- t/t9700/test.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t9700/test.pl b/t/t9700/test.pl index 570b0c5680..f83e6169e2 100755 --- a/t/t9700/test.pl +++ b/t/t9700/test.pl @@ -118,7 +118,7 @@ unlink $tmpfile; # paths my $abs_git_dir = $abs_repo_dir . "/.git"; -if ($^O eq 'msys' or $^O eq 'cygwin') { +if ($^O eq 'msys') { $abs_git_dir = `cygpath -am "$abs_repo_dir/.git"`; $abs_git_dir =~ s/\r?\n?$//; } -- 2.47.3