Re: [PATCH] Fix git-svn to handle svn not reporting the md5sum of a file, and test.

[Eric Wong <normalperson@yhbt.net>]

James Y Knight <foom@fuhm.net> wrote:

Thanks.

Acked-by: Eric Wong <normalperson@yhbt.net>

> ---
>  git-svn.perl                    |    2 +-
>  t/t9112-git-svn-md5less-file.sh |   45 +++++++++++++++++++++++++++++++++++++++
>  2 files changed, 46 insertions(+), 1 deletions(-)
>  create mode 100755 t/t9112-git-svn-md5less-file.sh
> 
> diff --git a/git-svn.perl b/git-svn.perl
> index 3c4f490..b2773dc 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -2471,7 +2471,7 @@ sub close_file {
>  		$md5->addfile($fh);
>  		my $got = $md5->hexdigest;
>  		die "Checksum mismatch: $path\n",
> -		    "expected: $exp\n    got: $got\n" if ($got ne $exp);
> +		    "expected: $exp\n    got: $got\n" if (defined $exp && $got ne $exp);
>  		sysseek($fh, 0, 0) or croak $!;
>  		if ($fb->{mode_b} == 120000) {
>  			sysread($fh, my $buf, 5) == 5 or croak $!;
> diff --git a/t/t9112-git-svn-md5less-file.sh b/t/t9112-git-svn-md5less-file.sh
> new file mode 100755
> index 0000000..08313bb
> --- /dev/null
> +++ b/t/t9112-git-svn-md5less-file.sh
> @@ -0,0 +1,45 @@
> +test_description='test that git handles an svn repository with missing md5sums'
> +
> +. ./lib-git-svn.sh
> +
> +# Loading a node from a svn dumpfile without a Text-Content-Length
> +# field causes svn to neglect to store or report an md5sum.  (it will
> +# calculate one if you had put Text-Content-Length: 0).  This showed
> +# up in a repository creted with cvs2svn.
> +
> +cat > dumpfile.svn <<EOF
> +SVN-fs-dump-format-version: 1
> +
> +Revision-number: 1
> +Prop-content-length: 98
> +Content-length: 98
> +
> +K 7
> +svn:log
> +V 0
> +
> +K 10
> +svn:author
> +V 4
> +test
> +K 8
> +svn:date
> +V 27
> +2007-05-06T12:37:01.153339Z
> +PROPS-END
> +
> +Node-path: md5less-file
> +Node-kind: file
> +Node-action: add
> +Prop-content-length: 10
> +Content-length: 10
> +
> +PROPS-END
> +
> +EOF
> +
> +test_expect_success 'load svn dumpfile' "svnadmin load $rawsvnrepo < dumpfile.svn"
> +
> +test_expect_success 'initialize git-svn' "git-svn init $svnrepo"
> +test_expect_success 'fetch revisions from svn' 'git-svn fetch'
> +test_done
> -- 
> 1.5.2.rc2.1.g7f0b
> 

-- 
Eric Wong