From 5acffd34738f9718caf2a5811bddbf2f40e968a0 Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Wed, 1 Sep 2021 19:52:20 +0300 Subject: diff-index: restore -c/--cc options handling This fixes 19b2517f (diff-merges: move specific diff-index "-m" handling to diff-index, 2021-05-21). That commit disabled handling of all diff for merges options in diff-index on an assumption that they are unused. However, it later appeared that -c and --cc, even though undocumented and not being covered by tests, happen to have had particular effect on diff-index output. Restore original -c/--cc options handling by diff-index. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- diff-merges.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'diff-merges.h') diff --git a/diff-merges.h b/diff-merges.h index b5d57f6563..19639689bb 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -11,7 +11,7 @@ struct rev_info; int diff_merges_config(const char *value); -void diff_merges_suppress_options_parsing(void); +void diff_merges_suppress_m_parsing(void); int diff_merges_parse_opts(struct rev_info *revs, const char **argv); -- cgit v1.3-5-g9baa