git/diff-merges.h
Sergey Organov 19b2517f95 diff-merges: move specific diff-index "-m" handling to diff-index
Move specific handling of "-m" for diff-index to diff-index.c, so
diff-merges is left to handle only diff for merges options.

Being a better design by itself, this is especially essential in
preparation for letting -m imply -p, as "diff-index -m" obviously
should not imply -p, as it's entirely unrelated.

To handle this, in addition to moving specific diff-index "-m" code
out of diff-merges, we introduce new

  diff_merges_suppress_options_parsing()

and call it before generic options processing in cmd_diff_index().

This new diff_merges_suppress_options_parsing() could then be reused
and called before invocations of setup_revisions() for other commands
that don't need --diff-merges options, but that's outside of the scope
of these patch series.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-05-21 09:24:14 +09:00

29 lines
693 B
C

#ifndef DIFF_MERGES_H
#define DIFF_MERGES_H
/*
* diff-merges - utility module to handle command-line options for
* selection of particular diff format of merge commits
* representation.
*/
struct rev_info;
int diff_merges_config(const char *value);
void diff_merges_suppress_options_parsing(void);
int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
void diff_merges_suppress(struct rev_info *revs);
void diff_merges_default_to_first_parent(struct rev_info *revs);
void diff_merges_default_to_dense_combined(struct rev_info *revs);
void diff_merges_set_dense_combined_if_unset(struct rev_info *revs);
void diff_merges_setup_revs(struct rev_info *revs);
#endif