summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-02 13:51:59 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-02 13:51:59 -0700
commit73ff8cf784b6ee447072fad6c06fd0eef0e9c9f6 (patch)
tree6f93ea84bccd1e22b5d048a5bd7096b18be6d109 /diff.h
parent85dcc3820b6471a9ad367ebc7ede37a8cb0d9fba (diff)
parentbafa16e53c8845f3d3b7713dcbef8a5c841cadad (diff)
downloadgit-73ff8cf784b6ee447072fad6c06fd0eef0e9c9f6.tar.gz
Merge branch 'lp/diffstat-with-graph'
"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 (2) * lp/diffstat-with-graph: t4052: work around shells unable to set COLUMNS to 1 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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 870dc91db8..e027650cb0 100644
--- a/diff.h
+++ b/diff.h
@@ -152,6 +152,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;
};