diff options
| author | Jeff King <peff@peff.net> | 2008-10-26 00:50:02 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-26 14:09:48 -0700 |
| commit | a79b8b6623288f7d5409ad749cc6553976a4f0e8 (patch) | |
| tree | e832f50094e91ae29c39a9178a34667a87fe92c5 | |
| parent | 4f672ad6c77bfe73cc5dd4b240fd42303d101d2a (diff) | |
| download | git-a79b8b6623288f7d5409ad749cc6553976a4f0e8.tar.gz git-a79b8b6623288f7d5409ad749cc6553976a4f0e8.tar.xz | |
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>
| -rwxr-xr-x | t/t4030-diff-textconv.sh | 8 | ||||
| -rw-r--r-- | wt-status.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index 3945731e9..09967f566 100755 --- 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_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(-) diff --git a/wt-status.c b/wt-status.c index 54d2f5869..6a7645ed8 100644 --- 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; + DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV); rev.diffopt.file = s->fp; rev.diffopt.close_file = 0; /* |