commit 46e63efc072bc440e4c6aad33d3157b70f5172b6
author Sven Verdoolaege <skimo@kotnet.org> Mon Jul 04 15:28:36 2005 +0200
committer Sven Verdoolaege <skimo@kotnet.org> Mon Jul 04 15:28:36 2005 +0200
tree 2c4fd7286e29e6041808d07874ef2151e3876676
parent 79ee456cf222982f7ee3f003440c57b5f7cffa8b

git-cvsimport-script: fix branch switching

Previous patch broke branch switching.

git-cvsimport-script

diff --git a/git-cvsimport-script b/git-cvsimport-script
index 0531af3..418c209 100755
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -651,9 +651,10 @@
 		}
 		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";