summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-cvsimport-script5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-cvsimport-script b/git-cvsimport-script
index 3f157725c8..1151fb8c0d 100755
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -338,6 +338,11 @@ unless(-d $git_dir) {
$last_branch = $opt_o;
$orig_branch = "";
} else {
+ -f "$git_dir/refs/head/$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";
+
$last_branch = basename(readlink("$git_dir/HEAD"));
unless($last_branch) {
warn "Cannot read the last branch name: $! -- assuming 'master'\n";