Merge branch 'js/maint-pretty-mailmap' into maint

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 5a0255052c9360fdc4cbbdd79008a206ab3e4623..cacbfc0259fd1ae353117d93e345cd8c4dd41188 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -227,6 +227,7 @@ sub conn {
                                $proxyport = $1;
                        }
                }
+               $repo ||= '/';
 
                # if username is not explicit in CVSROOT, then use current user, as cvs would
                $user=(getlogin() || $ENV{'LOGNAME'} || $ENV{'USER'} || "anonymous") unless $user;