summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-21 07:05:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-21 07:05:31 (GMT)
commite87b1c943a50af9ab51df20b3419cbffa4e75484 (patch)
tree178e42250704ebfe685bed5a3592c41fb013ddca /merge-recursive.c
parentac78e548049f4e86b38368d2c4b4dbb546c64ac6 (diff)
downloadgit-e87b1c943a50af9ab51df20b3419cbffa4e75484.zip
git-e87b1c943a50af9ab51df20b3419cbffa4e75484.tar.gz
git-e87b1c943a50af9ab51df20b3419cbffa4e75484.tar.bz2
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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 96e461c..3d39589 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++;