enable textconv for diff in verbose status/commit

This diff is meant for human consumption, so it makes sense
to apply text conversion here, as we would for the regular
diff porcelain.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh
index 3945731e9a92eccffa6fcea4164da3bcbf991b3d..09967f56639035d12c5211d56e82ef2ef51e512d 100755 (executable)
--- a/t/t4030-diff-textconv.sh
+++ b/t/t4030-diff-textconv.sh
@@ -76,6 +76,14 @@ test_expect_success 'format-patch produces binary' '
        test_cmp expect.binary actual
 '
 
        test_cmp expect.binary actual
 '
 

+test_expect_success 'status -v produces text' '
+       git reset --soft HEAD^ &&
+       git status -v >diff &&
+       find_diff <diff >actual &&
+       test_cmp expect.text actual &&
+       git reset --soft HEAD@{1}
+'
+

 cat >expect.stat <<'EOF'
  file |  Bin 2 -> 4 bytes
  1 files changed, 0 insertions(+), 0 deletions(-)
 cat >expect.stat <<'EOF'
  file |  Bin 2 -> 4 bytes
  1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/wt-status.c b/wt-status.c
index 54d2f586938d121bf49a7640883e1e525009589c..6a7645ed86fd5879e959460011a8add015d392d9 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -301,6 +301,7 @@ static void wt_status_print_verbose(struct wt_status *s)
        setup_revisions(0, NULL, &rev, s->reference);
        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
        rev.diffopt.detect_rename = 1;
        setup_revisions(0, NULL, &rev, 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;
        /*
        rev.diffopt.file = s->fp;
        rev.diffopt.close_file = 0;
        /*