Merge branch 'sk/send-pack-all-fix' into maint

diff --git a/t/t9700/test.pl b/t/t9700/test.pl
index 7e8c40b97b4eecc2347ab2986a97b62148fe5f88..1b75c919651a8126e2a327f3d9645d4377823726 100755 (executable)
--- a/t/t9700/test.pl
+++ b/t/t9700/test.pl
@@ -17,6 +17,12 @@ BEGIN
 use Cwd;
 use File::Basename;
 
+sub adjust_dirsep {
+       my $path = shift;
+       $path =~ s{\\}{/}g;
+       return $path;
+}
+
 BEGIN { use_ok('Git') }
 
 # set up
@@ -33,7 +39,7 @@ BEGIN
 is($r->config_int("test.nonexistent"), undef, "config_int: nonexistent");
 ok($r->config_bool("test.booltrue"), "config_bool: true");
 ok(!$r->config_bool("test.boolfalse"), "config_bool: false");
-is($r->config_path("test.path") =~ s/\\/\//gr, $r->config("test.pathexpanded"),
+is(adjust_dirsep($r->config_path("test.path")), $r->config("test.pathexpanded"),
    "config_path: ~/foo expansion");
 is_deeply([$r->config_path("test.pathmulti")], ["foo", "bar"],
    "config_path: multiple values");