diff options
| -rwxr-xr-x | git-cvsimport-script | 3 |
1 files changed, 2 insertions, 1 deletions
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(<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"; |