git-cvsimport-script: fix branch switching

Previous patch broke branch switching.

diff --git a/git-cvsimport-script b/git-cvsimport-script
index 0531af30aa90667c267f871caf758182e3b2c03c..418c209c80b866ff9472c1afde182f34b6eb1449 100755 (executable)
--- 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";