1. Stefan Saasen
  2. git

Commits

Pascal Obry  committed 3fb9d58

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>

  • Participants
  • Parent commits 79b4fde
  • Branches master

Comments (0)

Files changed (1)

File git-cvsimport.perl

View file
 		}
 		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>) {
 			};
 		}
 
-		$pass = $self->_scramble($pass);
-
 		my ($s, $rep);
 		if ($proxyhost) {