diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-21 09:05:31 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-21 09:05:31 +0200 |
| commit | e87b1c943a50af9ab51df20b3419cbffa4e75484 (patch) | |
| tree | 178e42250704ebfe685bed5a3592c41fb013ddca /merge-recursive.c | |
| parent | Simplify calling of CR/LF conversion routines (diff) | |
| download | git-e87b1c943a50af9ab51df20b3419cbffa4e75484.tar.xz git-e87b1c943a50af9ab51df20b3419cbffa4e75484.zip | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 96e461c737..3d395895fc 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++; |