Commit 9382bb31 authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'jk/maint-cvsimport-pathname'

* jk/maint-cvsimport-pathname:
  cvsimport: fix relative argument filenames
parents 18432dfd f6fdbb68
......@@ -579,10 +579,21 @@ ($)
return $r;
}
my $user_filename_prepend = '';
sub munge_user_filename {
my $name = shift;
return File::Spec->file_name_is_absolute($name) ?
$name :
$user_filename_prepend . $name;
}
-d $git_tree
or mkdir($git_tree,0777)
or die "Could not create $git_tree: $!";
chdir($git_tree);
if ($git_tree ne '.') {
$user_filename_prepend = getwd() . '/';
chdir($git_tree);
}
my $last_branch = "";
my $orig_branch = "";
......@@ -644,7 +655,7 @@ ($)
-f "$git_dir/cvs-authors" and
read_author_info("$git_dir/cvs-authors");
if ($opt_A) {
read_author_info($opt_A);
read_author_info(munge_user_filename($opt_A));
write_author_info("$git_dir/cvs-authors");
}
......@@ -679,7 +690,7 @@ ($)
$? == 0 or die "git-cvsimport: fatal: cvsps reported error\n";
close $cvspsfh;
} else {
$cvspsfile = $opt_P;
$cvspsfile = munge_user_filename($opt_P);
}
open(CVS, "<$cvspsfile") or die $!;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment