Git::cat_blob: allow using an empty blob to fix git-svn breakage

gitster · gitster · commit d683a0e00cd4 · 2008-05-27T23:35:55.000-07:00
Recent "git-svn optimization" series introduced Git::cat_blob() subroutine
whose interface was broken in that it returned the size of the blob but
signalled an error by returning 0.  You can never use an empty blob with
such an interface.

This fixes the interface to return a negative value to signal an error.

Reported by Björn Steinbrink.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-svn.perl b/git-svn.perl
@@ -3191,7 +3191,7 @@ sub apply_textdelta {
 	if ($fb->{blob}) {
 		print $base 'link ' if ($fb->{mode_a} == 120000);
 		my $size = $::_repository->cat_blob($fb->{blob}, $base);
-		die "Failed to read object $fb->{blob}" unless $size;
+		die "Failed to read object $fb->{blob}" if ($size < 0);
 
 		if (defined $exp) {
 			seek $base, 0, 0 or croak $!;
@@ -3570,7 +3570,7 @@ sub chg_file {
 		$self->change_file_prop($fbat,'svn:special',undef);
 	}
 	my $size = $::_repository->cat_blob($m->{sha1_b}, $fh);
-	croak "Failed to read object $m->{sha1_b}" unless $size;
+	croak "Failed to read object $m->{sha1_b}" if ($size < 0);
 	$fh->flush == 0 or croak $!;
 	seek $fh, 0, 0 or croak $!;
 
diff --git a/perl/Git.pm b/perl/Git.pm
@@ -811,12 +811,12 @@ sub cat_blob {
 	my $description = <$in>;
 	if ($description =~ / missing$/) {
 		carp "$sha1 doesn't exist in the repository";
-		return 0;
+		return -1;
 	}
 
 	if ($description !~ /^[0-9a-fA-F]{40} \S+ (\d+)$/) {
 		carp "Unexpected result returned from git cat-file";
-		return 0;
+		return -1;
 	}
 
 	my $size = $1;

Original file line number	Diff line number	Diff line change
`@@ -811,12 +811,12 @@ sub cat_blob {`
`811`	`811`	`my $description = <$in>;`
`812`	`812`	`if ($description =~ / missing$/) {`
`813`	`813`	`carp "$sha1 doesn't exist in the repository";`
`814`		`- return 0;`
	`814`	`+ return -1;`
`815`	`815`	`}`
`816`	`816`
`817`	`817`	`if ($description !~ /^[0-9a-fA-F]{40} \S+ (\d+)$/) {`
`818`	`818`	`carp "Unexpected result returned from git cat-file";`
`819`		`- return 0;`
	`819`	`+ return -1;`
`820`	`820`	`}`
`821`	`821`
`822`	`822`	`my $size = $1;`