diff options
| -rw-r--r-- | builtin-log.c | 2 | ||||
| -rw-r--r-- | builtin-rev-list.c | 2 | ||||
| -rw-r--r-- | log-tree.c | 8 | ||||
| -rw-r--r-- | log-tree.h | 2 | ||||
| -rw-r--r-- | revision.c | 4 | ||||
| -rw-r--r-- | revision.h | 1 |
6 files changed, 14 insertions, 5 deletions
diff --git a/builtin-log.c b/builtin-log.c index a0944f70a4..176cbce308 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -56,6 +56,8 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix, if (!strcmp(arg, "--decorate")) { load_ref_decorations(); decorate = 1; + } else if (!strcmp(arg, "--source")) { + rev->show_source = 1; } else die("unrecognized argument: %s", arg); } diff --git a/builtin-rev-list.c b/builtin-rev-list.c index 06cdeb7ebe..857742a14f 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -100,7 +100,7 @@ static void show_commit(struct commit *commit) children = children->next; } } - show_decorations(commit); + show_decorations(&revs, commit); if (revs.commit_format == CMIT_FMT_ONELINE) putchar(' '); else diff --git a/log-tree.c b/log-tree.c index cec3c06136..cf7947b9c9 100644 --- a/log-tree.c +++ b/log-tree.c @@ -52,11 +52,13 @@ static void show_parents(struct commit *commit, int abbrev) } } -void show_decorations(struct commit *commit) +void show_decorations(struct rev_info *opt, struct commit *commit) { const char *prefix; struct name_decoration *decoration; + if (opt->show_source && commit->util) + printf(" %s", (char *) commit->util); decoration = lookup_decoration(&name_decoration, &commit->object); if (!decoration) return; @@ -279,7 +281,7 @@ void show_log(struct rev_info *opt) fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout); if (opt->print_parents) show_parents(commit, abbrev_commit); - show_decorations(commit); + show_decorations(opt, commit); if (opt->graph && !graph_is_commit_finished(opt->graph)) { putchar('\n'); graph_show_remainder(opt->graph); @@ -352,7 +354,7 @@ void show_log(struct rev_info *opt) printf(" (from %s)", diff_unique_abbrev(parent->object.sha1, abbrev_commit)); - show_decorations(commit); + show_decorations(opt, commit); printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET)); if (opt->commit_format == CMIT_FMT_ONELINE) { putchar(' '); diff --git a/log-tree.h b/log-tree.h index 3c8127bb7c..f2a90084ae 100644 --- a/log-tree.h +++ b/log-tree.h @@ -12,7 +12,7 @@ int log_tree_diff_flush(struct rev_info *); int log_tree_commit(struct rev_info *, struct commit *); int log_tree_opt_parse(struct rev_info *, const char **, int); void show_log(struct rev_info *opt); -void show_decorations(struct commit *commit); +void show_decorations(struct rev_info *opt, struct commit *commit); void log_write_email_headers(struct rev_info *opt, const char *name, const char **subject_p, const char **extra_headers_p, diff --git a/revision.c b/revision.c index 2f646deab0..d45f05a00c 100644 --- a/revision.c +++ b/revision.c @@ -199,6 +199,8 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object mark_parents_uninteresting(commit); revs->limited = 1; } + if (revs->show_source && !commit->util) + commit->util = (void *) name; return commit; } @@ -484,6 +486,8 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit, if (parse_commit(p) < 0) return -1; + if (revs->show_source && !p->util) + p->util = commit->util; p->object.flags |= left_flag; if (!(p->object.flags & SEEN)) { p->object.flags |= SEEN; diff --git a/revision.h b/revision.h index 2fdb2dd0ff..51a48630e8 100644 --- a/revision.h +++ b/revision.h @@ -53,6 +53,7 @@ struct rev_info { left_right:1, rewrite_parents:1, print_parents:1, + show_source:1, reverse:1, reverse_output_stage:1, cherry_pick:1, |