Browse Source

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>
maint
Junio C Hamano 18 years ago
parent
commit
e87b1c943a
  1. 3
      merge-recursive.c

3
merge-recursive.c

@ -902,8 +902,9 @@ static int read_merge_config(const char *var, const char *value) @@ -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++;

Loading…
Cancel
Save