From 888ab716adff5babae718e4e4cb83b3c3a5f1bc5 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 26 Jan 2016 15:34:35 +0100 Subject: Git.pm: stop assuming that absolute paths start with a slash On Windows, absolute paths never start with a slash, unless a POSIX emulation layer is used. The latter is the case for MSYS2's Perl that Git for Windows leverages. However, in the tests we also go through plain `git.exe`, which does *not* leverage the POSIX emulation layer, and therefore the paths we pass to Perl may actually be DOS-style paths such as C:/Program Files/Git. So let's just use Perl's own way to test whether a given path is absolute or not instead of home-brewing our own. This patch partially fixes t7800 and t9700 when running in Git for Windows' SDK. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- perl/Git.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'perl') diff --git a/perl/Git.pm b/perl/Git.pm index 19ef081103..49eb88af8d 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -188,7 +188,8 @@ sub repository { }; if ($dir) { - $dir =~ m#^/# or $dir = $opts{Directory} . '/' . $dir; + _verify_require(); + File::Spec->file_name_is_absolute($dir) or $dir = $opts{Directory} . '/' . $dir; $opts{Repository} = abs_path($dir); # If --git-dir went ok, this shouldn't die either. -- cgit v1.2.3