cvsimport: Exit if an existing repository doesn't have the right branch.
This commit is contained in:
parent
e371046b64
commit
4c24e089a3
@ -338,6 +338,11 @@ unless(-d $git_dir) {
|
|||||||
$last_branch = $opt_o;
|
$last_branch = $opt_o;
|
||||||
$orig_branch = "";
|
$orig_branch = "";
|
||||||
} else {
|
} 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"));
|
$last_branch = basename(readlink("$git_dir/HEAD"));
|
||||||
unless($last_branch) {
|
unless($last_branch) {
|
||||||
warn "Cannot read the last branch name: $! -- assuming 'master'\n";
|
warn "Cannot read the last branch name: $! -- assuming 'master'\n";
|
||||||
|
Loading…
Reference in New Issue
Block a user