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>
Sergey Organov committed
May 21, 2021 at 00:47 UTC
fd16a39944ce2f2967ed015379f5bd05bac639bb
2 files changed
+6
-6
diff-merges.c
+5
-5
@@ -15,7 +15,7 @@ static void suppress(struct rev_info *revs)
15
revs->combine_merges = 0;
16
revs->dense_combined_merges = 0;
17
revs->combined_all_paths = 0;
18
- revs->combined_imply_patch = 0;
18
+ revs->merges_imply_patch = 0;
19
revs->merges_need_diff = 0;
20
}
21
@@ -109,10 +109,10 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
109
set_to_default(revs);
110
} else if (!strcmp(arg, "-c")) {
111
set_combined(revs);
112
- revs->combined_imply_patch = 1;
112
+ revs->merges_imply_patch = 1;
113
} else if (!strcmp(arg, "--cc")) {
114
set_dense_combined(revs);
115
- revs->combined_imply_patch = 1;
115
+ revs->merges_imply_patch = 1;
116
} else if (!strcmp(arg, "--no-diff-merges")) {
117
suppress(revs);
118
} else if (!strcmp(arg, "--combined-all-paths")) {
@@ -162,9 +162,9 @@ void diff_merges_setup_revs(struct rev_info *revs)
162
revs->first_parent_merges = 0;
163
if (revs->combined_all_paths && !revs->combine_merges)
164
die("--combined-all-paths makes no sense without -c or --cc");
165
- if (revs->combined_imply_patch)
165
+ if (revs->merges_imply_patch)
166
revs->diff = 1;
167
- if (revs->combined_imply_patch || revs->merges_need_diff) {
167
+ if (revs->merges_imply_patch || revs->merges_need_diff) {
168
if (!revs->diffopt.output_format)
169
revs->diffopt.output_format = DIFF_FORMAT_PATCH;
170
}
revision.h
+1
-1
@@ -195,10 +195,10 @@ struct rev_info {
195
/* Diff-merge flags */
196
explicit_diff_merges: 1,
197
merges_need_diff: 1,
198
+ merges_imply_patch:1,
199
separate_merges: 1,
200
combine_merges:1,
201
combined_all_paths:1,
201
- combined_imply_patch:1,
202
dense_combined_merges:1,
203
first_parent_merges:1;
204