Merge branch 'lh/parsing'

* lh/parsing:
  ui-tag: show the taggers email
  parsing.c: be prepared for unexpected content in commit/tag objects

1 files changed, 4 insertions, 0 deletions

diff --git a/ui-tag.c b/ui-tag.c
index b4db32e..3aea87d 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -63,6 +63,10 @@ void cgit_print_tag(char *revname)
                 if (info->tagger) {
                         html("<tr><td>Tagged by</td><td>");
                         html_txt(info->tagger);
+                        if (info->tagger_email) {
+                                html(" ");
+                                html_txt(info->tagger_email);
+                        }
                         html("</td></tr>\n");
                 }
                 html("<tr><td>Tagged object</td><td>");