Merge branch 'dk/t5813-unc-paths' into maint

peff · peff · commit 76fdb0640e4a · 2015-12-01T17:20:52.000-05:00
Test portability fix for a topic in v2.6.1.

* dk/t5813-unc-paths:
  t5813: avoid creating urls that break on cygwin
diff --git a/t/t5813-proto-disable-ssh.sh b/t/t5813-proto-disable-ssh.sh
@@ -14,7 +14,7 @@ test_expect_success 'setup repository to clone' '
 '
 
 test_proto "host:path" ssh "remote:repo.git"
-test_proto "ssh://" ssh "ssh://remote/$PWD/remote/repo.git"
-test_proto "git+ssh://" ssh "git+ssh://remote/$PWD/remote/repo.git"
+test_proto "ssh://" ssh "ssh://remote$PWD/remote/repo.git"
+test_proto "git+ssh://" ssh "git+ssh://remote$PWD/remote/repo.git"
 
 test_done

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ test_expect_success 'setup repository to clone' '`
`14`	`14`	`'`
`15`	`15`
`16`	`16`	`test_proto "host:path" ssh "remote:repo.git"`
`17`		`-test_proto "ssh://" ssh "ssh://remote/$PWD/remote/repo.git"`
`18`		`-test_proto "git+ssh://" ssh "git+ssh://remote/$PWD/remote/repo.git"`
	`17`	`+test_proto "ssh://" ssh "ssh://remote$PWD/remote/repo.git"`
	`18`	`+test_proto "git+ssh://" ssh "git+ssh://remote$PWD/remote/repo.git"`
`19`	`19`
`20`	`20`	`test_done`