log: when --cc is given, default to -p unless told otherwise
The "--cc" option to "git log" is clearly a request to show some sort of combined diff (be it --patch or --raw), but traditionally we required the command line to explicitly ask for "git log -p --cc". Teach the command line parser to treat a lone "--cc" as if the user specified "-p --cc". Formats that do ask for other forms of diff output, e.g. "log --raw --cc", are not overriden. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 20, 2015 at 14:36 UTC
c7eaf8b4c3085fd2db2a47b83b828e363dcf5fd0
1 file changed
+4
builtin/log.c
+4
@@ -633,6 +633,10 @@ static void log_setup_revisions_tweak(struct rev_info *rev,
633
if (DIFF_OPT_TST(&rev->diffopt, DEFAULT_FOLLOW_RENAMES) &&
634
rev->prune_data.nr == 1)
635
DIFF_OPT_SET(&rev->diffopt, FOLLOW_RENAMES);
636
+
637
+ /* Turn --cc/-c into -p --cc/-c when -p was not given */
638
+ if (!rev->diffopt.output_format && rev->combine_merges)
639
+ rev->diffopt.output_format = DIFF_FORMAT_PATCH;
640
}
641
642
int cmd_log(int argc, const char **argv, const char *prefix)