When printing aggregate information about revisions, this option allows to add the 1-line summary of the revision to provide the reader with some additional context about the revision itself. Signed-off-by: Edmundo Carmona Antoranz <eantoranz@xxxxxxxxx> --- Documentation/blame-options.txt | 4 ++++ Documentation/git-blame.txt | 2 +- builtin/blame.c | 13 +++++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index be2a327ff..64858a631 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -53,6 +53,10 @@ include::line-range-format.txt[] Aggregate information about revisions. This option makes no difference on incremental or porcelain format. +--hint:: + Show revision hints on aggregated information about the revision. + Implies --aggregate. + --encoding=<encoding>:: Specifies the encoding used to output author names and commit summaries. Setting it to `none` makes blame diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 385eaf7be..ed8b119fa 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental] [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>] - [--progress] [--abbrev=<n>] [--aggregate] + [--progress] [--abbrev=<n>] [--aggregate] [--hint] [<rev> | --contents <file> | --reverse <rev>..<rev>] [--] <file> DESCRIPTION diff --git a/builtin/blame.c b/builtin/blame.c index 09b3b0c8a..7473b50e9 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -1885,6 +1885,7 @@ static const char *format_time(unsigned long time, const char *tz_str, #define OUTPUT_SHOW_EMAIL 0400 #define OUTPUT_LINE_PORCELAIN 01000 #define OUTPUT_AGGREGATE 02000 +#define OUTPUT_HINT 04000 static void emit_porcelain_details(struct origin *suspect, int repeat) { @@ -2001,8 +2002,12 @@ static void print_revision_info(char* revision_hex, int revision_length, struct if (line_number && (opt & OUTPUT_AGGREGATE)) printf(opt & OUTPUT_ANNOTATE_COMPAT ? "%*d)" : " %*d) ", max_digits, line_number); - if (!line_number) - printf(")\n"); + if (!line_number) { + printf(")"); + if (opt & OUTPUT_HINT) + printf(" %s", ci.summary.buf); + printf("\n"); + } } static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt) @@ -2018,6 +2023,9 @@ static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt) get_commit_info(suspect->commit, &ci, 1); sha1_to_hex_r(hex, suspect->commit->object.oid.hash); + if (~(opt & OUTPUT_AGGREGATE) & (opt & OUTPUT_HINT)) + opt=opt|OUTPUT_AGGREGATE; + if (opt & OUTPUT_AGGREGATE) print_revision_info(hex, revision_length, ent, ci, opt, show_raw_time, 0); @@ -2638,6 +2646,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) { OPTION_CALLBACK, 'M', NULL, &opt, N_("score"), N_("Find line movements within and across files"), PARSE_OPT_OPTARG, blame_move_callback }, OPT_STRING_LIST('L', NULL, &range_list, N_("n,m"), N_("Process only line range n,m, counting from 1")), OPT_BIT(0, "aggregate", &output_option, N_("Aggregate output"), OUTPUT_AGGREGATE), + OPT_BIT(0, "hint", &output_option, N_("Show revision hints"), OUTPUT_HINT), OPT__ABBREV(&abbrev), OPT_END() }; -- 2.11.0.rc1