mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 08:34:54 +01:00
Code

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2007-04-21 00:05:31 -07:00
parent ac78e54804
commit e87b1c943a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
merge-recursive.c
View File

@ -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++;