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 <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/log-tree.c b/log-tree.c
index c0fa09632776885f07552001016a67e77ef19187..d8ca36bbdd92f77e7d955c86bb11823a21501fa6 100644 (file)
--- 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');
                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);;
                        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 8e2cd2fcf603cdcf667b8d5d9c61a6ce902dd189..82621601d63fff25c46d96b0ade5058fe4e16a28 100644 (file)
--- 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);
                        else
                                printf("%d", commit_reflog->reflogs->nr
                                       - 2 - commit_reflog->recno);

-                       printf("}: ");
+                       printf("}: %s", info->message);

                }
                else {
                        printf("Reflog: %s@{", commit_reflog->reflogs->ref);
                }
                else {
                        printf("Reflog: %s@{", commit_reflog->reflogs->ref);