diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 21:06:52 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 21:06:53 +0400 |
commit | 9aa620dfae29183c57ecc351a097f9553d1b1ac1 (patch) | |
tree | 5a24f5193fdbba1eb13de0944220f4f27407bc64 /diff.h | |
parent | 42325fb2e078377a3914bf1d80160f22cb1f78d6 (diff) | |
parent | bafa16e53c8845f3d3b7713dcbef8a5c841cadad (diff) |
Merge branch 'lp/diffstat-with-graph' into maint
"log --graph" was not very friendly with "--stat" option and its output
had line breaks at wrong places.
By Lucian Poston (5) and Zbigniew Jędrzejewski-Szmek (3)
* lp/diffstat-with-graph:
t4052: work around shells unable to set COLUMNS to 1
test-lib: skip test with COLUMNS=1 under mksh
Prevent graph_width of stat width from falling below min
t4052: Test diff-stat output with minimum columns
t4052: Adjust --graph --stat output for prefixes
Adjust stat width calculations to take --graph output into account
Add output_prefix_length to diff_options
t4052: test --stat output with --graph
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -150,6 +150,7 @@ struct diff_options { diff_format_fn_t format_callback; void *format_callback_data; diff_prefix_fn_t output_prefix; + int output_prefix_length; void *output_prefix_data; }; |