archive-tar: fix pax extended header length calculation

diff --git a/combine-diff.c b/combine-diff.c
index ea79830f619c57f3e780589b0f58ee428a4a00ee..23d8fabe75d9d80b2811acfc20f62d210ec6bba8 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -996,7 +996,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
        if (!userdiff)
                userdiff = userdiff_find_by_name("default");
        if (opt->flags.allow_textconv)
-               textconv = userdiff_get_textconv(userdiff);
+               textconv = userdiff_get_textconv(opt->repo, userdiff);
 
        /* Read the result of merge first */
        if (!working_tree_file)
@@ -1327,6 +1327,7 @@ static const char *path_path(void *obj)
 #define STAT_FORMAT_MASK (DIFF_FORMAT_NUMSTAT \
                          | DIFF_FORMAT_SHORTSTAT \
                          | DIFF_FORMAT_SUMMARY \
+                         | DIFF_FORMAT_DIRSTAT \
                          | DIFF_FORMAT_DIFFSTAT)
 
 /* find set of paths that every parent touches */