cvsimport: perform string comparison on "HEAD"

[git.git] / git-cvsimport-script

diff --git a/git-cvsimport-script b/git-cvsimport-script
index f3e2a49..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;
@@ -498,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>) {
@@ -532,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;