mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
4f672ad6c7
commit
a79b8b6623
|
@ -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(-)
|
||||
|
|
|
@ -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;
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue