From: Sven Verdoolaege <skimo@kotnet.org>
Date: Mon, 4 Jul 2005 13:28:36 +0000 (+0200)
Subject: git-cvsimport-script: fix branch switching
X-Git-Tag: v0.99~71^2^2^2~5
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=46e63efc072bc440e4c6aad33d3157b70f5172b6;p=git.git

git-cvsimport-script: fix branch switching

Previous patch broke branch switching.
---

diff --git a/git-cvsimport-script b/git-cvsimport-script
index 0531af30..418c209c 100755
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -651,9 +651,10 @@ while(<CVS>) {
 		}
 		if(($ancestor || $branch) ne $last_branch) {
 			print "Switching from $last_branch to $branch\n" if $opt_v;
-			system("git-read-tree","-m","$last_branch","$branch");
+			system("git-read-tree", $branch);
 			die "read-tree failed: $?\n" if $?;
 		}
+		$last_branch = $branch if $branch ne $last_branch;
 		$state = 9;
 	} elsif($state == 8) {
 		$logmsg .= "$_\n";