mirror of
https://github.com/git/git.git
synced 2026-01-21 06:17:19 +09:00
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 <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
68cb7f9e92
commit
c381a21490
@ -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?$//;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user