summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-20 21:59:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-21 03:57:02 (GMT)
commit66b2ed09c2f0f212c5cd5c095c1f1052ecbb9491 (patch)
tree3dae0edece540e07d06146bb6a5dbf5f6873aec6 /log-tree.c
parent9504f3d3d2e62cb6fba9e7c61c6fe69dec9053a4 (diff)
downloadgit-66b2ed09c2f0f212c5cd5c095c1f1052ecbb9491.zip
git-66b2ed09c2f0f212c5cd5c095c1f1052ecbb9491.tar.gz
git-66b2ed09c2f0f212c5cd5c095c1f1052ecbb9491.tar.bz2
Fix "log" family not to be too agressive about showing notes
Giving "Notes" information in the default output format of "log" and "show" is a sensible progress (the user has asked for it by having the notes), but for some commands (e.g. "format-patch") spewing notes into the formatted commit log message without being asked is too aggressive. Enable notes output only for "log", "show", "whatchanged" by default and only when the user didn't ask any specific --pretty/--format from the command line; users can explicitly override this default with --show-notes and --no-notes option. Parts of tests are taken from Jeff King's fix. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c
index 0fdf159..27afcf6 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -284,6 +284,7 @@ void show_log(struct rev_info *opt)
struct pretty_print_context ctx = {0};
opt->loginfo = NULL;
+ ctx.show_notes = opt->show_notes;
if (!opt->verbose_header) {
graph_show_commit(opt->graph);