Merge branch 'maint'

diff --git a/wt-status.c b/wt-status.c
index 3edae43ce9d99b27ed69166d90db71bc3c219404..96ff2f8f564b907b9ef77bd2ea41b5e854a13085 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -279,11 +279,11 @@ static void wt_status_print_verbose(struct wt_status *s)
        struct rev_info rev;
 
        init_revisions(&rev, NULL);
+       DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
        setup_revisions(0, NULL, &rev,
                s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference);
        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
        rev.diffopt.detect_rename = 1;
-       DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
        rev.diffopt.file = s->fp;
        rev.diffopt.close_file = 0;
        /*