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>
Junio C Hamano committed
Apr 21, 2007 at 00:05 UTC
e87b1c943a50af9ab51df20b3419cbffa4e75484
1 file changed
+2
-1
merge-recursive.c
+2
-1
@@ -902,8 +902,9 @@ static int read_merge_config(const char *var, const char *value)
902
namebuf[namelen] = 0;
903
fn->name = namebuf;
904
fn->fn = ll_ext_merge;
905
- fn->next = *ll_user_merge_tail;
905
+ fn->next = NULL;
906
*ll_user_merge_tail = fn;
907
+ ll_user_merge_tail = &(fn->next);
908
}
909
910
ep++;