X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-cvsimport.perl;h=d7411151ddbe3594431dafac46608a8f487a0263;hb=511a3fc116799df5e3b2262f8f6e501ca73ba2fe;hp=593832d813d88971aea00c8052c451f66e209830;hpb=b5a8dc7e066ac739a42f87f64e067d08ff842470;p=git.git

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 593832d81..d7411151d 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) {