From 4c24e089a33d27e9f15dc746c43a816fabcc060c Mon Sep 17 00:00:00 2001
From: Matthias Urlichs <smurf@kiste.(none)>
Date: Thu, 30 Jun 2005 22:10:32 +0200
Subject: [PATCH] cvsimport: Exit if an existing repository doesn't have the
 right branch.

---
 git-cvsimport-script | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/git-cvsimport-script b/git-cvsimport-script
index 3f157725c..1151fb8c0 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";
-- 
2.30.2