git-cvsimport: do not fail when CVSROOT is /

book · gitster · commit 8c372fb01dcd · 2008-06-10T22:24:01.000-07:00
For CVS repositories with unusual CVSROOT, git-cvsimport would fail:

    $ git-cvsimport -v -C foo -d :pserver:anon:@cvs.example.com:/ foo
    AuthReply: error 0 : no such repository

This patch ensures that the path is never empty, but at least '/'.

Signed-off-by: Philippe Bruhat (BooK) &lt;book@cpan.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,7 @@ sub conn {`
`227`	`227`	`$proxyport = $1;`
`228`	`228`	`}`
`229`	`229`	`}`
	`230`	`+ $repo \|\|= '/';`
`230`	`231`
`231`	`232`	`# if username is not explicit in CVSROOT, then use current user, as cvs would`
`232`	`233`	`$user=(getlogin() \|\| $ENV{'LOGNAME'} \|\| $ENV{'USER'} \|\| "anonymous") unless $user;`