diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-12 15:50:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-29 02:05:06 -0700 |
| commit | 093dc5bee61c47f5b0f3bea04339c9bf8839ca47 (patch) | |
| tree | 5750e8fcf151f234ddd5a4a869a67569d84f894e /builtin-blame.c | |
| parent | 28a94f885a735e7474357698ec384de24d526620 (diff) | |
| download | git-093dc5bee61c47f5b0f3bea04339c9bf8839ca47.tar.gz git-093dc5bee61c47f5b0f3bea04339c9bf8839ca47.tar.xz | |
blame -s: suppress author name and time.
With this "git blame -b -s HEAD~n..HEAD" becomes a nicer way to
review the result of recent changes in context.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-blame.c')
| -rw-r--r-- | builtin-blame.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index 8919b028e..de8031103 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -18,7 +18,7 @@ #include "cache-tree.h" static char blame_usage[] = -"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [--incremental] [commit] [--] file\n" +"git-blame [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [--incremental] [commit] [--] file\n" " -c Use the same output mode as git-annotate (Default: off)\n" " -b Show blank SHA-1 for boundary commits (Default: off)\n" " -l Show long commit SHA1 (Default: off)\n" @@ -26,6 +26,7 @@ static char blame_usage[] = " -t Show raw timestamp (Default: off)\n" " -f, --show-name Show original filename (Default: auto)\n" " -n, --show-number Show original linenumber (Default: off)\n" +" -s Suppress author name and timestamp (Default: off)\n" " -p, --porcelain Show in a format designed for machine consumption\n" " -L n,m Process only line range n,m, counting from 1\n" " -M, -C Find line movements within and across files\n" @@ -1483,6 +1484,7 @@ static const char *format_time(unsigned long time, const char *tz_str, #define OUTPUT_SHOW_NAME 020 #define OUTPUT_SHOW_NUMBER 040 #define OUTPUT_SHOW_SCORE 0100 +#define OUTPUT_NO_AUTHOR 0200 static void emit_porcelain(struct scoreboard *sb, struct blame_entry *ent) { @@ -1577,10 +1579,15 @@ static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt) if (opt & OUTPUT_SHOW_NUMBER) printf(" %*d", max_orig_digits, ent->s_lno + 1 + cnt); - printf(" (%-*.*s %10s %*d) ", - longest_author, longest_author, ci.author, - format_time(ci.author_time, ci.author_tz, - show_raw_time), + + if (!(opt & OUTPUT_NO_AUTHOR)) + printf(" (%-*.*s %10s", + longest_author, longest_author, + ci.author, + format_time(ci.author_time, + ci.author_tz, + show_raw_time)); + printf(" %*d) ", max_digits, ent->lno + 1 + cnt); } do { @@ -2092,6 +2099,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix) output_option |= OUTPUT_RAW_TIMESTAMP; else if (!strcmp("-l", arg)) output_option |= OUTPUT_LONG_OBJECT_NAME; + else if (!strcmp("-s", arg)) + output_option |= OUTPUT_NO_AUTHOR; else if (!strcmp("-S", arg) && ++i < argc) revs_file = argv[i]; else if (!prefixcmp(arg, "-M")) { |