diff options
author | Sergey Organov <sorganov@gmail.com> | 2021-05-20 21:47:02 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-05-21 00:24:14 (GMT) |
commit | fd16a39944ce2f2967ed015379f5bd05bac639bb (patch) | |
tree | 4a6e70ac59f4019281af3e50dd4fcd70ae61cf06 | |
parent | 1e20a407fe28b4bdba3b973b26b0b60ff6b6c97d (diff) | |
download | git-fd16a39944ce2f2967ed015379f5bd05bac639bb.zip git-fd16a39944ce2f2967ed015379f5bd05bac639bb.tar.gz git-fd16a39944ce2f2967ed015379f5bd05bac639bb.tar.bz2 |
diff-merges: rename "combined_imply_patch" to "merges_imply_patch"
This is refactoring change in preparation for the next commit that
will let -m imply -p.
The old name doesn't match the intention to let not only -c/-cc imply
-p, but also -m, that is not a "combined" format, so we rename the
flag accordingly.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | diff-merges.c | 10 | ||||
-rw-r--r-- | revision.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/diff-merges.c b/diff-merges.c index 9ca00cd..d897fd8 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -15,7 +15,7 @@ static void suppress(struct rev_info *revs) revs->combine_merges = 0; revs->dense_combined_merges = 0; revs->combined_all_paths = 0; - revs->combined_imply_patch = 0; + revs->merges_imply_patch = 0; revs->merges_need_diff = 0; } @@ -109,10 +109,10 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) set_to_default(revs); } else if (!strcmp(arg, "-c")) { set_combined(revs); - revs->combined_imply_patch = 1; + revs->merges_imply_patch = 1; } else if (!strcmp(arg, "--cc")) { set_dense_combined(revs); - revs->combined_imply_patch = 1; + revs->merges_imply_patch = 1; } else if (!strcmp(arg, "--no-diff-merges")) { suppress(revs); } else if (!strcmp(arg, "--combined-all-paths")) { @@ -162,9 +162,9 @@ void diff_merges_setup_revs(struct rev_info *revs) revs->first_parent_merges = 0; if (revs->combined_all_paths && !revs->combine_merges) die("--combined-all-paths makes no sense without -c or --cc"); - if (revs->combined_imply_patch) + if (revs->merges_imply_patch) revs->diff = 1; - if (revs->combined_imply_patch || revs->merges_need_diff) { + if (revs->merges_imply_patch || revs->merges_need_diff) { if (!revs->diffopt.output_format) revs->diffopt.output_format = DIFF_FORMAT_PATCH; } @@ -195,10 +195,10 @@ struct rev_info { /* Diff-merge flags */ explicit_diff_merges: 1, merges_need_diff: 1, + merges_imply_patch:1, separate_merges: 1, combine_merges:1, combined_all_paths:1, - combined_imply_patch:1, dense_combined_merges:1, first_parent_merges:1; |