diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index ac74bc51b3197d06f13f588d6916400ac3e6fcf0..f68afe78a0a0ea4997b8988f241cd3a675d785f9 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
$last_branch = $opt_o;
$orig_branch = "";
} else {
- -f "$git_dir/refs/heads/$opt_o"
- or die "Branch '$opt_o' does not exist.\n".
- "Either use the correct '-o branch' option,\n".
- "or import to a new repository.\n";
-
open(F, "git-symbolic-ref HEAD |") or
die "Cannot run git-symbolic-ref: $!\n";
chomp ($last_branch = <F>);
$branch_date{$head} = $1;
}
close(H);
+ if (!exists $branch_date{$opt_o}) {
+ die "Branch '$opt_o' does not exist.\n".
+ "Either use the correct '-o branch' option,\n".
+ "or import to a new repository.\n";
+ }
}
-d $git_dir