From: Seth Falcon <sethfalcon@gmail.com>
Date: Mon, 30 Apr 2007 14:33:38 GMT
Subject: Re: git-svn failure when symlink added in svn
Message-ID: <m2abwqq6d9.fsf@ziti.local>
In-Reply-To: <20070430063133.GA14414@untitled>

Eric Wong <normalperson@yhbt.net> writes:

> Junio C Hamano <junkio@cox.net> wrote:
>> Eric Wong <normalperson@yhbt.net> writes:
>> 
>> > Junio C Hamano <junkio@cox.net> wrote:
>> >> diff --git a/git-svn.perl b/git-svn.perl
>> >> index 4be8576..cef6697 100755
>> >> --- a/git-svn.perl
>> >> +++ b/git-svn.perl
>> >> @@ -2464,15 +2464,15 @@ sub close_file {
>> >>  	my $hash;
>> >>  	my $path = $self->git_path($fb->{path});
>> >>  	if (my $fh = $fb->{fh}) {
>> >> -		seek($fh, 0, 0) or croak $!;
>> >> +		sysseek($fh, 0, 0) or croak $!;
>> >>  		my $md5 = Digest::MD5->new;
>> >>  		$md5->addfile($fh);
>> >
>> > We may want to keep the plain seek() here and do both seek and sysseek,
>> > I'm not sure if $md5->addfile() uses read or sysread internally.
>> 
>> Ok.  The seek before Digest::MD5 can stay as it has been that
>> way for a long time without causing problems.  How about this as
>> an replacement then?
>
> Looks good to me.  Seth?

The test cases passes as does the small example I had come up with.  I
also tried doing a git svn clone on a small repos and checking that
the resulting HEAD was the same as a previously created one (it was).

> If Seth is okay with it, then:
> Acked-by: Eric Wong <normalperson@yhbt.net>
Acked-by: Seth Falcon <sethfalcon@gmail.com>


+ seth