cvsimport: perform string comparison on "HEAD"

diff --git a/git-cvsimport-script b/git-cvsimport-script
index 9b23d1f0169b8c9a1a9358ac4706b557634476ae..8e0e4ac4b2e4bd2f8da3ad4511e5f9af371f9e2b 100755 (executable)
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -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;