Re: git-svn failure when symlink added in svn
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:07
Eric Wong [off-list ref] writes:
Alexander: please don't drop me from the Cc next time, thanks. Junio C Hamano [off-list ref] wrote:quoted
Seth Falcon [off-list ref] writes:quoted
Junio C Hamano [off-list ref] writes: ...quoted
Then I suspect the following could be less invasive and more efficient fix for the problem. I do not have an access to MacOS box, and I do not have a working sync with any SVN repository, so I cannot test it myself, though...... Well, I think the sysseek should be done only when we did read 'link ' from the beginning and not in other cases, so in that sense my patch is very broken. Probably the sysseek() needs to be done inside the "if ($fb->mode_b} == 120000)" part, after it checks for 'link '.Yes, don't add the new sysseek there. All the reads and seeks in that block of code should probably be sysreads and sysseeks instead. Feel free to patch and test this as I don't have time at the moment.
Ok. As I do not have an access to a working sync with an SVN repository nor a Mac OS box, I cannot test this, but something like this should be applied to 'maint' before v1.5.1.3. I've run testsuite we have including t9XXX series, but that is the only test I did. Testing, acks and feedback are very much appreciated. -- >8 -- Fix symlink handling in git-svn, related to PerlIO After reading the leading contents from a symlink data obtained from subversion, which we expect to begin with 'link ', the code forked to hash the remainder (which should match readlink() result) using git-hash-objects, by redirecting its STDIN from the filehandle we read that 'link ' from. This was Ok with Perl on modern Linux, but on Mac OS, the read in the parent process slurped more than we asked for in stdio buffer, and the child did not correctly see the "remainder". This attempts to fix the issue by using lower level sysseek and sysread instead of seek and read to bypass the stdio buffer. Signed-off-by: Junio C Hamano <redacted> --- git-svn.perl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
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); my $got = $md5->hexdigest; die "Checksum mismatch: $path\n", "expected: $exp\n got: $got\n" if ($got ne $exp); - seek($fh, 0, 0) or croak $!; + sysseek($fh, 0, 0) or croak $!; if ($fb->{mode_b} == 120000) { - read($fh, my $buf, 5) == 5 or croak $!; + sysread($fh, my $buf, 5) == 5 or croak $!; $buf eq 'link ' or die "$path has mode 120000", "but is not a link\n"; }