X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=combine-diff.c;h=bb1cc96c4e73c90ee327858aa3b36cf2bfe043a4;hb=9b3497cab9986883ff2499722f8758795afa34b7;hp=978668036835e16df4b6bfd37a7b1e9f8494cf07;hpb=264d5a717bb450ae06969face25c70b000e1358f;p=thirdparty%2Fgit.git

diff --git a/combine-diff.c b/combine-diff.c
index 9786680368..bb1cc96c4e 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -111,7 +111,7 @@ static char *grab_blob(const unsigned char *sha1, unsigned int mode,
 		return xcalloc(1, 1);
 	} else if (textconv) {
 		struct diff_filespec *df = alloc_filespec(path);
-		fill_filespec(df, sha1, mode);
+		fill_filespec(df, sha1, 1, mode);
 		*size = fill_textconv(textconv, df, &blob);
 		free_filespec(df);
 	} else {
@@ -823,7 +823,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 						   &result_size, NULL, NULL);
 		} else if (textconv) {
 			struct diff_filespec *df = alloc_filespec(elem->path);
-			fill_filespec(df, null_sha1, st.st_mode);
+			fill_filespec(df, null_sha1, 0, st.st_mode);
 			result_size = fill_textconv(textconv, df, &result);
 			free_filespec(df);
 		} else if (0 <= (fd = open(elem->path, O_RDONLY))) {