diff options
| author |  Matthias Urlichs <smurf@kiste.(none)> | 2005-06-30 22:10:32 +0200 |
|---|---|---|
| committer | Matthias Urlichs <smurf@kiste.(none)> | 2005-06-30 22:10:32 +0200 |
| commit | 4c24e089a33d27e9f15dc746c43a816fabcc060c (patch) | |
| tree | 4e6b88985aca56c609a3a47108f3c24fc0c028a8 /git-cvsimport-script | |
| parent | cvs import: Strip whitespace at the end of the log entry (diff) | |
| download | tgif-4c24e089a33d27e9f15dc746c43a816fabcc060c.tar.xz | |
cvsimport: Exit if an existing repository doesn't have the right branch.
Diffstat (limited to 'git-cvsimport-script')
| -rwxr-xr-x | git-cvsimport-script | 5 |
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"; |