mirror of
https://github.com/git/git
synced 2024-10-12 11:32:34 +00:00
Merge remote-tracking branch 'origin/devel' into devel
This commit is contained in:
commit
2e8c8592f3
15
git-svn.perl
15
git-svn.perl
|
@ -22,14 +22,13 @@
|
|||
$Git::SVN::Ra::_log_window_size = 100;
|
||||
$Git::SVN::_minimize_url = 'unset';
|
||||
|
||||
if (! exists $ENV{SVN_SSH}) {
|
||||
if (exists $ENV{GIT_SSH}) {
|
||||
$ENV{SVN_SSH} = $ENV{GIT_SSH};
|
||||
if ($^O eq 'msys') {
|
||||
$ENV{SVN_SSH} =~ s/\\/\\\\/g;
|
||||
$ENV{SVN_SSH} =~ s/(.*)/"$1"/;
|
||||
}
|
||||
}
|
||||
if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) {
|
||||
$ENV{SVN_SSH} = $ENV{GIT_SSH};
|
||||
}
|
||||
|
||||
if (exists $ENV{SVN_SSH} && $^O eq 'msys') {
|
||||
$ENV{SVN_SSH} =~ s/\\/\\\\/g;
|
||||
$ENV{SVN_SSH} =~ s/(.*)/"$1"/;
|
||||
}
|
||||
|
||||
$Git::SVN::Log::TZ = $ENV{TZ};
|
||||
|
|
|
@ -12,7 +12,7 @@ test_expect_success \
|
|||
echo http://example.com/foo\&bar >expect &&
|
||||
git config browser.custom.cmd echo &&
|
||||
git web--browse --browser=custom \
|
||||
http://example.com/foo\&bar >actual &&
|
||||
http://example.com/foo\&bar | tr -d "\r" >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
@ -21,7 +21,7 @@ test_expect_success \
|
|||
echo http://example.com/foo\;bar >expect &&
|
||||
git config browser.custom.cmd echo &&
|
||||
git web--browse --browser=custom \
|
||||
http://example.com/foo\;bar >actual &&
|
||||
http://example.com/foo\;bar | tr -d "\r" >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
@ -30,7 +30,7 @@ test_expect_success \
|
|||
echo http://example.com/foo#bar >expect &&
|
||||
git config browser.custom.cmd echo &&
|
||||
git web--browse --browser=custom \
|
||||
http://example.com/foo#bar >actual &&
|
||||
http://example.com/foo#bar | tr -d "\r" >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
@ -44,7 +44,7 @@ test_expect_success \
|
|||
chmod +x "fake browser" &&
|
||||
git config browser.w3m.path "`pwd`/fake browser" &&
|
||||
git web--browse --browser=w3m \
|
||||
http://example.com/foo >actual &&
|
||||
http://example.com/foo | tr -d "\r" >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
@ -59,7 +59,7 @@ test_expect_success \
|
|||
}
|
||||
f" &&
|
||||
git web--browse --browser=custom \
|
||||
http://example.com/foo >actual &&
|
||||
http://example.com/foo | tr -d "\r" >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue