git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: James Y Knight <foom@fuhm.net>
To: git@vger.kernel.org
Cc: normalperson@yhbt.net, James Y Knight <foom@fuhm.net>
Subject: [PATCH] Fix git-svn to handle svn not reporting the md5sum of a file, and test.
Date: Thu, 24 May 2007 00:37:06 -0400	[thread overview]
Message-ID: <1179981426176-git-send-email-foom@fuhm.net> (raw)

---
 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

             reply	other threads:[~2007-05-24  4:49 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-24  4:37 James Y Knight [this message]
2007-05-24  9:16 ` [PATCH] Fix git-svn to handle svn not reporting the md5sum of a file, and test Eric Wong
2007-05-27 11:49 ` A Large Angry SCM
2007-05-27 17:23   ` Eric Wong
2007-05-27 19:28     ` A Large Angry SCM
2007-05-27 23:04       ` Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1179981426176-git-send-email-foom@fuhm.net \
    --to=foom@fuhm.net \
    --cc=git@vger.kernel.org \
    --cc=normalperson@yhbt.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).