diff options
| author | Pascal Obry <pascal@obry.net> | 2009-09-04 13:58:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-06 07:34:27 +0200 |
| commit | 3fb9d58235ce4985689840b901aecacc6e3bd094 (patch) | |
| tree | cbf235fd1c9b3b54b84205f60516f9fa02eeff30 | |
| parent | Merge branch 'maint' (diff) | |
| download | git-3fb9d58235ce4985689840b901aecacc6e3bd094.tar.xz git-3fb9d58235ce4985689840b901aecacc6e3bd094.zip | |
Do not scramble password read from .cvspass
Passwords stored in .cvspass are already scrambled, we do not
want to scramble them twice. Only passwords read from the
command line are scrambled.
This fixes a regression introduced by b2139db (git-cvsimport: add support
for cvs pserver password scrambling., 2009-08-14).
Signed-off-by: Pascal Obry <pascal@obry.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-cvsimport.perl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 593832d813..d7411151dd 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -238,7 +238,9 @@ sub conn { } my $rr = ":pserver:$user\@$serv:$port$repo"; - unless ($pass) { + if ($pass) { + $pass = $self->_scramble($pass); + } else { open(H,$ENV{'HOME'}."/.cvspass") and do { # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z while (<H>) { @@ -253,8 +255,6 @@ sub conn { }; } - $pass = $self->_scramble($pass); - my ($s, $rep); if ($proxyhost) { |