development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 14:03:28 +00:00
Code Issues Projects Releases Packages Wiki Activity
16112 commits 6 branches 956 tags 486 MiB
Commit graph

3 commits

Author SHA1 Message Date
Jim Meyering
90dce51584 use xstrdup, not strdup in ll-merge.c 
Otherwise, a fluky allocation failure would cause merge
configuration settings to be silently ignored.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-06-14 13:37:14 -07:00
Johannes Schindelin
ef90d6d420 Provide git_config with a callback-data parameter 
git_config() only had a function parameter, but no callback data
parameter.  This assumes that all callback functions only modify
global variables.

With this patch, every callback gets a void * parameter, and it is hoped
that this will help the libification effort.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-05-14 12:34:44 -07:00
Junio C Hamano
525ab63950 merge-recursive: split low-level merge functions out. 
This moves low-level merge functions out of merge-recursive.c and
places them in a new separate file, ll-merge.c

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-02-18 00:46:13 -08:00