X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=combine-diff.c;h=7693884fdb7e43d0aecd77ad1c71531181d7ceee;hb=459a21bd35675e140e19569e8b5c62c7fc4eee5b;hp=a23894d86927ccf3fcf4a9c720df49ff2364b749;hpb=f3a4ec48e402a7b49d410bdcb23470e9723788b0;p=git.git

diff --git a/combine-diff.c b/combine-diff.c
index a23894d8..7693884f 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "commit.h"
+#include "blob.h"
 #include "diff.h"
 #include "diffcore.h"
 #include "quote.h"
@@ -104,7 +105,7 @@ static char *grab_blob(const unsigned char *sha1, unsigned long *size)
 		return xcalloc(1, 1);
 	}
 	blob = read_sha1_file(sha1, type, size);
-	if (strcmp(type, "blob"))
+	if (strcmp(type, blob_type))
 		die("object '%s' is not a blob!", sha1_to_hex(sha1));
 	return blob;
 }
@@ -649,7 +650,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
 			int len = st.st_size;
 			int cnt = 0;
 
-			elem->mode = DIFF_FILE_CANON_MODE(st.st_mode);
+			elem->mode = canon_mode(st.st_mode);
 			size = len;
 			result = xmalloc(len + 1);
 			while (cnt < len) {