From: Junio C Hamano <junkio@cox.net>
Date: Sat, 21 Apr 2007 07:05:31 +0000 (-0700)
Subject: Fix bogus linked-list management for user defined merge drivers.
X-Git-Tag: v1.5.2-rc0~18^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e87b1c943a50af9ab51df20b3419cbffa4e75484;p=git.git

Fix bogus linked-list management for user defined merge drivers.

ll_user_merge_tail is supposed to point at the pointer to be
updated to point at a newly created item.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index 96e461c73..3d395895f 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -902,8 +902,9 @@ static int read_merge_config(const char *var, const char *value)
 		namebuf[namelen] = 0;
 		fn->name = namebuf;
 		fn->fn = ll_ext_merge;
-		fn->next = *ll_user_merge_tail;
+		fn->next = NULL;
 		*ll_user_merge_tail = fn;
+		ll_user_merge_tail = &(fn->next);
 	}
 
 	ep++;