summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-16 18:32:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-16 18:32:57 (GMT)
commit5e40e41f1c51581d8cd8f3816de49934fec784fc (patch)
treebea2660dd0a39a0470494a31f805474e6510f7bc /log-tree.c
parentefbef3f6e3a8c32f4f8bc78667733228ed76a713 (diff)
parentcf3983d1ff861657c8813feb7df82a74a29d06bc (diff)
downloadgit-5e40e41f1c51581d8cd8f3816de49934fec784fc.zip
git-5e40e41f1c51581d8cd8f3816de49934fec784fc.tar.gz
git-5e40e41f1c51581d8cd8f3816de49934fec784fc.tar.bz2
Merge branch 'zk/log-graph-showsig'
The "--show-signature" option did not pay much attention to "--graph". * zk/log-graph-showsig: log: fix indentation for --graph --show-signature
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 c13184a..f87b7e8 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -365,6 +365,7 @@ static void show_sig_lines(struct rev_info *opt, int status, const char *bol)
eol = strchrnul(bol, '\n');
printf("%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
*eol ? "\n" : "");
+ graph_show_oneline(opt->graph);
bol = (*eol) ? (eol + 1) : eol;
}
}