X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=sha1_file.c;h=edbf9f9a84602c9d7b0f8064a943bdc83344c728;hb=057c7d30183672d6ef96a9f3e87860058e1c08f8;hp=ece9dff80d5dd0e64508e93bf3bc1611a954cbea;hpb=e99d59ff0bff349ef205cef1076e0354c8130680;p=git.git

diff --git a/sha1_file.c b/sha1_file.c
index ece9dff8..edbf9f9a 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -9,6 +9,7 @@
 #include <stdarg.h>
 #include <limits.h>
 #include "cache.h"
+#include "delta.h"
 
 #ifndef O_NOATIME
 #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
@@ -353,6 +354,19 @@ void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size
 	if (map) {
 		buf = unpack_sha1_file(map, mapsize, type, size);
 		munmap(map, mapsize);
+		if (buf && !strcmp(type, "delta")) {
+			void *ref = NULL, *delta = buf;
+			unsigned long ref_size, delta_size = *size;
+			buf = NULL;
+			if (delta_size > 20)
+				ref = read_sha1_file(delta, type, &ref_size);
+			if (ref)
+				buf = patch_delta(ref, ref_size,
+						  delta+20, delta_size-20, 
+						  size);
+			free(delta);
+			free(ref);
+		}
 		return buf;
 	}
 	return NULL;