[PATCH v2] git svn: fix authenticaton with 'branch'

[PATCH v2] git svn: fix authenticaton with 'branch'

[Hiroshi Shirosaki]

Authentication fails with svn branch while svn rebase and
svn dcommit work fine without authentication failures.

$ git svn branch v7_3
Copying https://xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx at r27519
to https://xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/v7_3...
Can't create session: Unable to connect to a repository at URL
'https://xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': No more
credentials or we tried too many times.
Authentication failed at
C:\Program Files\Git\mingw64/libexec/git-core\git-svn line 1200.

We add auth configuration to SVN::Client->new() to fix the issue.

Signed-off-by: Hiroshi Shirosaki <h.shirosaki@gmail.com>
---
 git-svn.perl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index fa42364..d240418 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1175,10 +1175,10 @@ sub cmd_branch {
 	::_req_svn();
 	require SVN::Client;
 
+	my ($config, $baton, undef) = Git::SVN::Ra::prepare_config_once();
 	my $ctx = SVN::Client->new(
-		config => SVN::Core::config_get_config(
-			$Git::SVN::Ra::config_dir
-		),
+		auth => $baton,
+		config => $config,
 		log_msg => sub {
 			${ $_[0] } = defined $_message
 				? $_message
-- 
2.7.4

[PULL] git svn branch authentication fix

[Eric Wong]

Thank you.  I fixed spelling in the title (s/authenticaton/authentication/),
added my S-o-b, and pushed for Junio to pick up

The following changes since commit 3bc53220cb2dcf709f7a027a3f526befd021d858:

  First batch after 2.12 (2017-02-27 14:04:24 -0800)

are available in the git repository at:

  git://bogomips.org/git-svn.git svn-auth-branch

for you to fetch changes up to e0688e9b28f2c5ff711460ee8b62077be5df2360:

  git svn: fix authentication with 'branch' (2017-03-07 21:29:03 +0000)

----------------------------------------------------------------
Hiroshi Shirosaki (1):
      git svn: fix authentication with 'branch'

 git-svn.perl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Re: [PULL] git svn branch authentication fix

[Junio C Hamano]

Eric Wong <e@80x24.org> writes:

> Thank you.  I fixed spelling in the title (s/authenticaton/authentication/),
> added my S-o-b, and pushed for Junio to pick up
>
> The following changes since commit 3bc53220cb2dcf709f7a027a3f526befd021d858:
>
>   First batch after 2.12 (2017-02-27 14:04:24 -0800)
>
> are available in the git repository at:
>
>   git://bogomips.org/git-svn.git svn-auth-branch
>
> for you to fetch changes up to e0688e9b28f2c5ff711460ee8b62077be5df2360:
>
>   git svn: fix authentication with 'branch' (2017-03-07 21:29:03 +0000)
>
> ----------------------------------------------------------------
> Hiroshi Shirosaki (1):
>       git svn: fix authentication with 'branch'
>
>  git-svn.perl | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Thanks, both.  Will pull.