Re: Branch not showing up in rlog (git build 40f6256)
Hannes Küttner <[email protected]> Tue, 6 Dec 2016 17:29:13 +0100
| Newsgroups | gmane.comp.version-control.rcs.bugs |
|---|---|
| Message-ID | <[email protected]> |
Hi again! Sorry for all the traffic. Thought it would be a major thing thats why I wanted to fill you in early. Turns out it is just a minor but introduced in the forementioned anti-recursion commit. I attached a patch. It's tested against all available test and seems to work fine. Please let me know if it works for you as well (and if there was a problem in the first place) Mit freundlichem Gruß / With kind regards Hannes Küttner *MEINBERG Funkuhren GmbH & Co. KG* Lange Wand 9 D-31812 Bad Pyrmont, Germany Phone: +49 (0)5281 9309-0 Fax: +49 (0)5281 9309-30 Amtsgericht Hannover 17HRA 100322 Geschäftsführer: Günter Meinberg, Werner Meinberg, Andre Hartmann, Heiko Gerstung Email: [email protected] <mailto:[email protected]> Internet: www.meinberg.de <http://www.meinberg.de> ------------------------------------------------------------------------ *MEINBERG - Solutions for Time and Frequency Synchronization*
fix-branch-in-rlog.patch
(text/x-patch, 992 B)
From 6cb97ccc1f49215d1703d173ae96c60bef54d778 Mon Sep 17 00:00:00 2001 From: Hannes Kuettner <[email protected]> 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