cvsimport: perform string comparison on "HEAD"

[git.git] / git-cvsimport-script

diff --git a/git-cvsimport-script b/git-cvsimport-script
index 0d205c5..8e0e4ac 100755 (executable)
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -182,7 +182,7 @@ sub _file {
        $self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef;
        $self->{'socketo'}->write("Directory .\n") or return undef;
        $self->{'socketo'}->write("$self->{'repo'}\n") or return undef;
-       $self->{'socketo'}->write("Sticky T1.1\n") or return undef;
+       # $self->{'socketo'}->write("Sticky T1.0\n") or return undef;
        $self->{'socketo'}->write("co\n") or return undef;
        $self->{'socketo'}->flush() or return undef;
        $self->{'lines'} = 0;
@@ -397,10 +397,28 @@ my($patchset,$date,$author,$branch,$ancestor,$tag,$logmsg);
 my(@old,@new);
 my $commit = sub {
        my $pid;
-       system("git-update-cache","--force-remove","--",@old) if @old;
-       die "Cannot remove files: $?\n" if $?;
-       system("git-update-cache","--add","--",@new) if @new;
-       die "Cannot add files: $?\n" if $?;
+       while(@old) {
+               my @o2;
+               if(@old > 55) {
+                       @o2 = splice(@old,0,50);
+               } else {
+                       @o2 = @old;
+                       @old = ();
+               }
+               system("git-update-cache","--force-remove","--",@o2);
+               die "Cannot remove files: $?\n" if $?;
+       }
+       while(@new) {
+               my @n2;
+               if(@new > 55) {
+                       @n2 = splice(@new,0,50);
+               } else {
+                       @n2 = @new;
+                       @new = ();
+               }
+               system("git-update-cache","--add","--",@n2);
+               die "Cannot add files: $?\n" if $?;
+       }
 
        $pid = open(C,"-|");
        die "Cannot fork: $!" unless defined $pid;
@@ -480,9 +498,6 @@ my $commit = sub {
                        or die "Cannot write tag $branch: $!\n";
                print "Created tag '$tag' on '$branch'\n" if $opt_v;
        }
-
-       @old = ();
-       @new = ();
 };
 
 while(<CVS>) {
@@ -514,7 +529,7 @@ while(<CVS>) {
        } elsif($state == 5 and s/^Ancestor branch:\s+//) {
                s/\s+$//;
                $ancestor = $_;
-               $ancestor = $opt_o if $ancestor == "HEAD";
+               $ancestor = $opt_o if $ancestor eq "HEAD";
                $state = 6;
        } elsif($state == 5) {
                $ancestor = undef;