Merge branch 'jn/gitweb-patch' into maint

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 593832d813d88971aea00c8052c451f66e209830..1ad20ac96450d100fbce7e992ec65972a8c0a7ba 100755 (executable)
--- 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>) {
@@ -251,10 +253,9 @@ sub conn {
                                        }
                                }
                        };
+                       $pass = "A" unless $pass;
                }
 
-               $pass = $self->_scramble($pass);
-
                my ($s, $rep);
                if ($proxyhost) {