X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=combine-diff.c;fp=combine-diff.c;h=f17aab33f1d241097a16e2cfd8a1ab3361e45902;hb=1b0c7174a17de801051402ed35ac085ebd91e88c;hp=a23894d86927ccf3fcf4a9c720df49ff2364b749;hpb=e464f4c3119b04712ab87329f3dd4d4f21b0a8a7;p=git.git

diff --git a/combine-diff.c b/combine-diff.c
index a23894d8..f17aab33 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -649,7 +649,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) {