Merge branch 'jk/pretty-reglog-ent'

* jk/pretty-reglog-ent:
pretty: give placeholders to reflog identity

diff --combined reflog-walk.c
index 64c677fc49d7874736221b1828f96d8652cb1fb3,590737e844b84a7b15881159c271423661623828..86d18843f52046d87741bffa9f865ec973a2ae73
--- 1/reflog-walk.c
--- 2/reflog-walk.c
+++ b/reflog-walk.c
@@@ -50,13 -50,9 +50,13 @@@ static struct complete_reflogs *read_co
        for_each_reflog_ent(ref, read_one_reflog, reflogs);
        if (reflogs->nr == 0) {
                unsigned char sha1[20];
 -              const char *name = resolve_ref(ref, sha1, 1, NULL);
 -              if (name)
 +              const char *name;
 +              void *name_to_free;
 +              name = name_to_free = resolve_refdup(ref, sha1, 1, NULL);
 +              if (name) {
                        for_each_reflog_ent(name, read_one_reflog, reflogs);
 +                      free(name_to_free);
 +              }
        }
        if (reflogs->nr == 0) {
                int len = strlen(ref);
@@@ -172,11 -168,11 +172,11 @@@ int add_reflog_for_walk(struct reflog_w
        else {
                if (*branch == '\0') {
                        unsigned char sha1[20];
 -                      const char *head = resolve_ref("HEAD", sha1, 0, NULL);
 -                      if (!head)
 -                              die ("No current branch");
                        free(branch);
 -                      branch = xstrdup(head);
 +                      branch = resolve_refdup("HEAD", sha1, 0, NULL);
 +                      if (!branch)
 +                              die ("No current branch");
 +
                }
                reflogs = read_complete_reflog(branch);
                if (!reflogs || reflogs->nr == 0) {
@@@ -295,6 -291,18 +295,18 @@@ void get_reflog_message(struct strbuf *
        strbuf_add(sb, info->message, len);
  }
  
+ const char *get_reflog_ident(struct reflog_walk_info *reflog_info)
+ {
+       struct commit_reflog *commit_reflog = reflog_info->last_commit_reflog;
+       struct reflog_info *info;
+ 
+       if (!commit_reflog)
+               return NULL;
+ 
+       info = &commit_reflog->reflogs->items[commit_reflog->recno+1];
+       return info->email;
+ }
+ 
  void show_reflog_message(struct reflog_walk_info *reflog_info, int oneline,
        enum date_mode dmode)
  {