@matheusbsbs / matheus-bagliano / commits / be89cb239e
Fork 0

Allow the default low-level merge driver to be configured.

When no 'merge' attribute is given to a path, merge-recursive uses the built-in xdl-merge as the low-level merge driver. A new configuration item 'merge.default' can name a low-level merge driver of user's choice to be used instead. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Apr 18, 2007 at 01:47 UTC be89cb239e8ec02e23015675cc8b2d60992a6cfc
1 file changed +12 -2
merge-recursive.c
+12 -2
@@ -839,12 +839,18 @@ static struct user_merge_fn {
839 char *cmdline;
840 char b_[1];
841 } *ll_user_merge_fns, **ll_user_merge_fns_tail;
842 +static const char *default_ll_merge;
843
844 static int read_merge_config(const char *var, const char *value)
845 {
846 struct user_merge_fn *fn;
847 int blen, nlen;
848
849 + if (!strcmp(var, "merge.default")) {
850 + default_ll_merge = strdup(value);
851 + return 0;
852 + }
853 +
854 if (strcmp(var, "merge.driver"))
855 return 0;
856 if (!value)
@@ -900,8 +906,12 @@ static ll_merge_fn find_ll_merge_fn(void *merge_attr, const char **cmdline)
906 return ll_xdl_merge;
907 else if (ATTR_FALSE(merge_attr))
908 return ll_binary_merge;
903 - else if (ATTR_UNSET(merge_attr))
904 - return ll_xdl_merge;
909 + else if (ATTR_UNSET(merge_attr)) {
910 + if (!default_ll_merge)
911 + return ll_xdl_merge;
912 + else
913 + name = default_ll_merge;
914 + }
915 else
916 name = merge_attr;
917