diff options
| author |  Sven Verdoolaege <skimo@kotnet.org> | 2005-07-04 15:28:36 +0200 |
|---|---|---|
| committer | Sven Verdoolaege <skimo@kotnet.org> | 2005-07-04 15:28:36 +0200 |
| commit | 46e63efc072bc440e4c6aad33d3157b70f5172b6 (patch) | |
| tree | 2c4fd7286e29e6041808d07874ef2151e3876676 | |
| parent | git-cvsimport-script: use private index. (diff) | |
| download | tgif-46e63efc072bc440e4c6aad33d3157b70f5172b6.tar.xz | |
git-cvsimport-script: fix branch switching
Previous patch broke branch switching.
| -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 0531af30aa..418c209c80 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"; |