diff-merges: handle imply -p on -c/--cc logic for log.c
Move logic that handles implying -p on -c/--cc from log_setup_revisions_tweak() to diff_merges_setup_revs(), where it belongs. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Dec 21, 2020 at 18:19 UTC
0c627f5d3cbcb7d85219d9a4cfc195f7d4230b3d
2 files changed
+5
-4
builtin/log.c
-4
@@ -723,10 +723,6 @@ static void log_setup_revisions_tweak(struct rev_info *rev,
723
rev->prune_data.nr == 1)
724
rev->diffopt.flags.follow_renames = 1;
725
726
- /* Turn --cc/-c into -p --cc/-c when -p was not given */
727
- if (!rev->diffopt.output_format && rev->combine_merges)
728
- rev->diffopt.output_format = DIFF_FORMAT_PATCH;
729
-
726
if (rev->first_parent_only)
727
diff_merges_default_to_first_parent(rev);
728
}
diff-merges.c
+5
@@ -102,4 +102,9 @@ void diff_merges_setup_revs(struct rev_info *revs)
102
revs->ignore_merges = 1;
103
if (revs->combined_all_paths && !revs->combine_merges)
104
die("--combined-all-paths makes no sense without -c or --cc");
105
+ if (revs->combine_merges) {
106
+ /* Turn --cc/-c into -p --cc/-c when -p was not given */
107
+ if (!revs->diffopt.output_format)
108
+ revs->diffopt.output_format = DIFF_FORMAT_PATCH;
109
+ }
110
}