From 46e63efc072bc440e4c6aad33d3157b70f5172b6 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Mon, 4 Jul 2005 15:28:36 +0200 Subject: git-cvsimport-script: fix branch switching Previous patch broke branch switching. --- git-cvsimport-script | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'git-cvsimport-script') diff --git a/git-cvsimport-script b/git-cvsimport-script index 0531af30a..418c209c8 100755 --- a/git-cvsimport-script +++ b/git-cvsimport-script @@ -651,9 +651,10 @@ while() { } 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"; -- cgit v1.2.1