diff options
author | Sergey Organov <sorganov@gmail.com> | 2021-09-01 19:52:20 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-09-07 21:11:35 +0300 |
commit | 5acffd34738f9718caf2a5811bddbf2f40e968a0 (patch) | |
tree | b72a0462a5eff6c3157ea99c7b2a3cf07ec7c3b7 /diff-merges.h | |
parent | 225bc32a989d7a22fa6addafd4ce7dcd04675dbf (diff) |
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 <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-merges.h')
-rw-r--r-- | diff-merges.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |