diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-20 14:36:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-20 15:03:57 -0700 |
| commit | c7eaf8b4c3085fd2db2a47b83b828e363dcf5fd0 (patch) | |
| tree | 6a0dfec737f6e28818593b4bef40b85306f02b80 | |
| parent | log: rename "tweak" helpers (diff) | |
| download | tgif-c7eaf8b4c3085fd2db2a47b83b828e363dcf5fd0.tar.xz | |
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>
| -rw-r--r-- | builtin/log.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index 865110534d..e37c27ab7e 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) |