diff-tree: don't print multiple headers for merges when silent.

[git.git] / sha1_file.c

diff --git a/sha1_file.c b/sha1_file.c
index 83bc38c..edbf9f9 100644 (file)
--- 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__))
@@ -44,7 +45,7 @@ int get_sha1_hex(const char *hex, unsigned char *sha1)
        return 0;
 }
 
-int get_sha1_file(const char *path, unsigned char *result)
+static int get_sha1_file(const char *path, unsigned char *result)
 {
        char buffer[60];
        int fd = open(path, O_RDONLY);
@@ -199,7 +200,7 @@ static void prepare_alt_odb(void)
 {
        int pass, totlen, i;
        const char *cp, *last;
-       char *op = 0;
+       char *op = NULL;
        const char *alt = gitenv(ALTERNATE_DB_ENVIRONMENT) ? : "";
 
        /* The first pass counts how large an area to allocate to
@@ -236,7 +237,7 @@ static void prepare_alt_odb(void)
                if (pass)
                        break;
                alt_odb = xmalloc(sizeof(*alt_odb) * (i + 1) + totlen);
-               alt_odb[i].base = alt_odb[i].name = 0;
+               alt_odb[i].base = alt_odb[i].name = NULL;
                op = (char*)(&alt_odb[i+1]);
        }
 }
@@ -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;