Merge branch 'maint'

* maint: Use git-for-each-ref to check whether the origin branch exists.
git-mirror · May 23, 2007 · 1654a3b · 1654a3b
2 parents 32309f5 + 7ca055f
commit 1654a3b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
@@ -559,11 +559,6 @@ ($$)
 	$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>);
@@ -588,6 +583,11 @@ ($$)
 		$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