Skip to content

Commit

Permalink
git-cvsimport-script: fix branch switching
Browse files Browse the repository at this point in the history
Previous patch broke branch switching.
  • Loading branch information
Sven Verdoolaege committed Jul 4, 2005
1 parent 79ee456 commit 46e63ef
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion git-cvsimport-script
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down

0 comments on commit 46e63ef

Please sign in to comment.