From c7eaf8b4c3085fd2db2a47b83b828e363dcf5fd0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 20 Aug 2015 14:36:49 -0700 Subject: 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 diff --git a/builtin/log.c b/builtin/log.c index 8651105..e37c27a 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -633,6 +633,10 @@ static void log_setup_revisions_tweak(struct rev_info *rev, if (DIFF_OPT_TST(&rev->diffopt, DEFAULT_FOLLOW_RENAMES) && rev->prune_data.nr == 1) DIFF_OPT_SET(&rev->diffopt, FOLLOW_RENAMES); + + /* Turn --cc/-c into -p --cc/-c when -p was not given */ + if (!rev->diffopt.output_format && rev->combine_merges) + rev->diffopt.output_format = DIFF_FORMAT_PATCH; } int cmd_log(int argc, const char **argv, const char *prefix) -- cgit v0.10.2-6-g49f6