>From 6cb97ccc1f49215d1703d173ae96c60bef54d778 Mon Sep 17 00:00:00 2001 From: Hannes Kuettner Date: Tue, 6 Dec 2016 17:19:45 +0100 Subject: [PATCH] Fix bug: Handle tree in branch in rlog * src/rlog.c (putforest): Call putree for branch forest root --- src/rlog.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rlog.c b/src/rlog.c index 0293c7f..12a2dc0 100644 --- a/src/rlog.c +++ b/src/rlog.c @@ -264,8 +264,11 @@ putforest (struct wlink const *branchroot, const char *insDelFormat) /* Print branches that have the same direct ancestor ‘branchroot’. */ { /* FIXME: This recurses deeply in the worst case. */ - if (branchroot->next) - putforest (branchroot->next, insDelFormat); + if (branchroot->next) { + struct delta const *root = putforest (branchroot->next, insDelFormat); + putree(root, insDelFormat); + } + putabranch (branchroot->entry, insDelFormat); return branchroot->entry; -- 2.7.4