aboutsummaryrefslogtreecommitdiff
path: root/git-cvsimport-script
diff options
context:
space:
mode:
authorSven Verdoolaege <skimo@kotnet.org>2005-07-04 15:28:36 +0200
committerSven Verdoolaege <skimo@kotnet.org>2005-07-04 15:28:36 +0200
commit46e63efc072bc440e4c6aad33d3157b70f5172b6 (patch)
tree2c4fd7286e29e6041808d07874ef2151e3876676 /git-cvsimport-script
parent79ee456cf222982f7ee3f003440c57b5f7cffa8b (diff)
downloadgit-46e63efc072bc440e4c6aad33d3157b70f5172b6.tar.gz
git-46e63efc072bc440e4c6aad33d3157b70f5172b6.tar.xz
git-cvsimport-script: fix branch switching
Previous patch broke branch switching.
Diffstat (limited to 'git-cvsimport-script')
-rwxr-xr-xgit-cvsimport-script3
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";