From 903b45fe1808f72e712a118bf115b9dc07d02420 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Sat, 27 Jan 2007 22:40:36 -0500 Subject: [PATCH] git-log -g --pretty=oneline should display the reflog message In the context of reflog output the reflog message is more useful than the commit message's first line. When relevant the reflog message will contain that line anyway. Signed-off-by: Nicolas Pitre Signed-off-by: Junio C Hamano --- log-tree.c | 7 ++++++- reflog-walk.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/log-tree.c b/log-tree.c index c0fa09632..d8ca36bbd 100644 --- a/log-tree.c +++ b/log-tree.c @@ -224,9 +224,14 @@ void show_log(struct rev_info *opt, const char *sep) printf("%s", diff_get_color(opt->diffopt.color_diff, DIFF_RESET)); putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n'); - if (opt->reflog_info) + if (opt->reflog_info) { show_reflog_message(opt->reflog_info, opt->commit_format == CMIT_FMT_ONELINE);; + if (opt->commit_format == CMIT_FMT_ONELINE) { + printf("%s", sep); + return; + } + } } /* diff --git a/reflog-walk.c b/reflog-walk.c index 8e2cd2fcf..82621601d 100644 --- a/reflog-walk.c +++ b/reflog-walk.c @@ -233,7 +233,7 @@ void show_reflog_message(struct reflog_walk_info* info, int oneline) else printf("%d", commit_reflog->reflogs->nr - 2 - commit_reflog->recno); - printf("}: "); + printf("}: %s", info->message); } else { printf("Reflog: %s@{", commit_reflog->reflogs->ref); -- 2.30.2