X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=combine-diff.c;h=ea3ca5f950561a92fdd3be1a4ee4bbd726656118;hb=8960b5a7dfb160be65dc9122df8c7603a5f8aced;hp=3a9b32f6b8882f3adb91e5833c205635657a98b7;hpb=1589e0517fd22c198799504d6888d5a475024152;p=git.git

diff --git a/combine-diff.c b/combine-diff.c
index 3a9b32f6b..ea3ca5f95 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -714,7 +714,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 			result_size = len;
 			result = xmalloc(len + 1);
 			while (sz < len) {
-				int done = xread(fd, result+sz, len-sz);
+				ssize_t done = xread(fd, result+sz, len-sz);
 				if (done == 0)
 					break;
 				if (done < 0)
@@ -943,6 +943,7 @@ void diff_tree_combined(const unsigned char *sha1,
 	diffopts = *opt;
 	diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
 	diffopts.recursive = 1;
+	diffopts.allow_external = 0;
 
 	show_log_first = !!rev->loginfo && !rev->no_commit_id;
 	needsep = 0;