reflog-walk: don't free reflogs added to cache

diff --git a/reflog-walk.c b/reflog-walk.c
index c63eb1a3fd7fa1d6bdca8bacc1781bbf65f41593..2a43537326208343b6dea87b0136d782cd802b76 100644 (file)
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -136,6 +136,7 @@ struct reflog_walk_info {
 void init_reflog_walk(struct reflog_walk_info **info)
 {
        *info = xcalloc(1, sizeof(struct reflog_walk_info));
+       (*info)->complete_reflogs.strdup_strings = 1;
 }
 
 int add_reflog_for_walk(struct reflog_walk_info *info,
@@ -214,10 +215,6 @@ int add_reflog_for_walk(struct reflog_walk_info *info,
        if (recno < 0) {
                commit_reflog->recno = get_reflog_recno_by_time(reflogs, timestamp);
                if (commit_reflog->recno < 0) {
-                       if (reflogs) {
-                               free(reflogs->ref);
-                               free(reflogs);
-                       }
                        free(commit_reflog);
                        return -1;
                }
@@ -259,6 +256,8 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
                /* a root commit, but there are still more entries to show */
                reflog = &commit_reflog->reflogs->items[commit_reflog->recno];
                logobj = parse_object(reflog->noid.hash);
+               if (!logobj)
+                       logobj = parse_object(reflog->ooid.hash);
        }
 
        if (!logobj || logobj->type != OBJ_COMMIT) {