From: arnaudbrejeon <arnaud.brejeon@xxxxxxxxx> Signed-off-by: Arnaud Brejeon <arnaud.brejeon <at> gmail.com> --- git-svn.perl | 3 +++ perl/Git/SVN/Prompt.pm | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index ff1ce3d..07f0a6c 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -123,6 +123,7 @@ sub opt_prefix { return $_prefix || '' } $Git::SVN::Fetcher::_placeholder_filename = ".gitignore"; $_q ||= 0; my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username, + 'password=s' => \$Git::SVN::Prompt::_password, 'config-dir=s' => \$Git::SVN::Ra::config_dir, 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache, 'ignore-paths=s' => \$Git::SVN::Fetcher::_ignore_regex, @@ -206,6 +207,7 @@ my %cmd = ( 'parents' => \$_parents, 'tag|t' => \$_tag, 'username=s' => \$Git::SVN::Prompt::_username, + 'password=s' => \$Git::SVN::Prompt::_password, 'commit-url=s' => \$_commit_url } ], tag => [ sub { $_tag = 1; cmd_branch(@_) }, 'Create a tag in the SVN repository', @@ -214,6 +216,7 @@ my %cmd = ( 'dry-run|n' => \$_dry_run, 'parents' => \$_parents, 'username=s' => \$Git::SVN::Prompt::_username, + 'password=s' => \$Git::SVN::Prompt::_password, 'commit-url=s' => \$_commit_url } ], 'set-tree' => [ \&cmd_set_tree, "Set an SVN repository to a git tree-ish", diff --git a/perl/Git/SVN/Prompt.pm b/perl/Git/SVN/Prompt.pm index e940b08..a94a847 100644 --- a/perl/Git/SVN/Prompt.pm +++ b/perl/Git/SVN/Prompt.pm @@ -2,7 +2,7 @@ package Git::SVN::Prompt; use strict; use warnings; require SVN::Core; -use vars qw/$_no_auth_cache $_username/; +use vars qw/$_no_auth_cache $_username $_password/; sub simple { my ($cred, $realm, $default_username, $may_save, $pool) = @_; @@ -17,8 +17,14 @@ sub simple { } else { username($cred, $realm, $may_save, $pool); } - $cred->password(_read_password("Password for '" . - $cred->username . "': ", $realm)); + + if (defined $_password && length $_password) { + $cred->password($_password); + } else { + $cred->password(_read_password("Password for '" . + $cred->username . "': ", $realm)); + } + $cred->may_save($may_save); $SVN::_Core::SVN_NO_ERROR; } -- 1.7.10.2 (Apple Git-33) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html