зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
16507fcf0a
Коммит
903b45fe18
|
@ -224,9 +224,14 @@ void show_log(struct rev_info *opt, const char *sep)
|
||||||
printf("%s",
|
printf("%s",
|
||||||
diff_get_color(opt->diffopt.color_diff, DIFF_RESET));
|
diff_get_color(opt->diffopt.color_diff, DIFF_RESET));
|
||||||
putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
|
putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
|
||||||
if (opt->reflog_info)
|
if (opt->reflog_info) {
|
||||||
show_reflog_message(opt->reflog_info,
|
show_reflog_message(opt->reflog_info,
|
||||||
opt->commit_format == CMIT_FMT_ONELINE);;
|
opt->commit_format == CMIT_FMT_ONELINE);;
|
||||||
|
if (opt->commit_format == CMIT_FMT_ONELINE) {
|
||||||
|
printf("%s", sep);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -233,7 +233,7 @@ void show_reflog_message(struct reflog_walk_info* info, int oneline)
|
||||||
else
|
else
|
||||||
printf("%d", commit_reflog->reflogs->nr
|
printf("%d", commit_reflog->reflogs->nr
|
||||||
- 2 - commit_reflog->recno);
|
- 2 - commit_reflog->recno);
|
||||||
printf("}: ");
|
printf("}: %s", info->message);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
printf("Reflog: %s@{", commit_reflog->reflogs->ref);
|
printf("Reflog: %s@{", commit_reflog->reflogs->ref);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче