diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 15:19:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 21:47:31 (GMT) |
| commit | 564a4fc8471b41fc05bda16e4bbb02a99b515cbf (patch) | |
| tree | 6afadc528467d146595b7fe3bd96869cebeb91bc /diff-merges.c | |
| parent | 4f54544d736e286538ebef0d3120c164f80f04c1 (diff) | |
| download | git-564a4fc8471b41fc05bda16e4bbb02a99b515cbf.zip git-564a4fc8471b41fc05bda16e4bbb02a99b515cbf.tar.gz git-564a4fc8471b41fc05bda16e4bbb02a99b515cbf.tar.bz2 | |
diff-merges: re-arrange functions to match the order they are called in
For clarity, define public functions in the order they are called, to
make logic inter-dependencies easier to grok.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-merges.c')
| -rw-r--r-- | diff-merges.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/diff-merges.c b/diff-merges.c index 76c8045..8325ab8 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -2,6 +2,10 @@ #include "revision.h" +/* + * Public functions. They are in the order they are called. + */ + void diff_merges_init_revs(struct rev_info *revs) { revs->ignore_merges = -1; @@ -46,16 +50,6 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) return argcount; } -void diff_merges_setup_revs(struct rev_info *revs) -{ - if (revs->combine_merges && revs->ignore_merges < 0) - revs->ignore_merges = 0; - if (revs->ignore_merges < 0) - revs->ignore_merges = 1; - if (revs->combined_all_paths && !revs->combine_merges) - die("--combined-all-paths makes no sense without -c or --cc"); -} - void diff_merges_default_to_first_parent(struct rev_info *revs) { if (revs->ignore_merges < 0) /* No -m */ @@ -72,3 +66,13 @@ void diff_merges_default_to_dense_combined(struct rev_info *revs) } } } + +void diff_merges_setup_revs(struct rev_info *revs) +{ + if (revs->combine_merges && revs->ignore_merges < 0) + revs->ignore_merges = 0; + if (revs->ignore_merges < 0) + revs->ignore_merges = 1; + if (revs->combined_all_paths && !revs->combine_merges) + die("--combined-all-paths makes no sense without -c or --cc"); +} |