undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-cvsimport-pathname' into maint

Browse Source 
* jk/maint-cvsimport-pathname:
  cvsimport: fix relative argument filenames
This commit is contained in:
Junio C Hamano 2009-11-15 16:37:53 -08:00
commit 04b3577535
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
git-cvsimport.perl
View File

@ -579,10 +579,21 @@ sub get_headref ($) {
return $r; 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 -d $git_tree
or mkdir($git_tree,0777) or mkdir($git_tree,0777)
or die "Could not create $git_tree: $!"; 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 $last_branch = "";
my $orig_branch = ""; my $orig_branch = "";
@ -644,7 +655,7 @@ unless (-d $git_dir) {
-f "$git_dir/cvs-authors" and -f "$git_dir/cvs-authors" and
read_author_info("$git_dir/cvs-authors"); read_author_info("$git_dir/cvs-authors");
if ($opt_A) { if ($opt_A) {
read_author_info($opt_A); read_author_info(munge_user_filename($opt_A));
write_author_info("$git_dir/cvs-authors"); write_author_info("$git_dir/cvs-authors");
} }
@ -679,7 +690,7 @@ unless ($opt_P) {
$? == 0 or die "git-cvsimport: fatal: cvsps reported error\n"; $? == 0 or die "git-cvsimport: fatal: cvsps reported error\n";
close $cvspsfh; close $cvspsfh;
} else { } else {
$cvspsfile = $opt_P; $cvspsfile = munge_user_filename($opt_P);
} }
open(CVS, "<$cvspsfile") or die $!; open(CVS, "<$cvspsfile") or die $!;