undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-cvsimport-script: fix branch switching

Browse Source 
Previous patch broke branch switching.
This commit is contained in:
Sven Verdoolaege 2005-07-04 15:28:36 +02:00
parent 79ee456cf2
commit 46e63efc07
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-cvsimport-script
View File

@ -651,9 +651,10 @@ while(<CVS>) {
} }
if(($ancestor || $branch) ne $last_branch) { if(($ancestor || $branch) ne $last_branch) {
print "Switching from $last_branch to $branch\n" if $opt_v; 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 $?; die "read-tree failed: $?\n" if $?;
} }
$last_branch = $branch if $branch ne $last_branch;
$state = 9; $state = 9;
} elsif($state == 8) { } elsif($state == 8) {
$logmsg .= "$_\n"; $logmsg .= "$_\n";