@matheusbsbs / matheus-bagliano / commits / 3086486d32
Fork 0

Allow low-level driver to specify different behaviour during internal merge.

This allows [merge "drivername"] to have a variable "recursive" that names a different low-level merge driver to be used when merging common ancestors to come up with a virtual ancestor. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Apr 18, 2007 at 12:18 UTC 3086486d326b00ce308208e62e0e0de831f3563b
1 file changed +12
merge-recursive.c
+12
@@ -677,6 +677,7 @@ struct ll_merge_driver {
677 const char *name;
678 const char *description;
679 ll_merge_fn fn;
680 + const char *recursive;
681 struct ll_merge_driver *next;
682 char *cmdline;
683 };
@@ -934,6 +935,13 @@ static int read_merge_config(const char *var, const char *value)
935 return 0;
936 }
937
938 + if (!strcmp("recursive", ep)) {
939 + if (!value)
940 + return error("%s: lacks value", var);
941 + fn->recursive = strdup(value);
942 + return 0;
943 + }
944 +
945 return 0;
946 }
947
@@ -1013,6 +1021,10 @@ static int ll_merge(mmbuffer_t *result_buf,
1021 merge_attr = git_path_check_merge(a->path);
1022 driver = find_ll_merge_driver(merge_attr);
1023
1024 + if (index_only && driver->recursive) {
1025 + merge_attr = git_attr(driver->recursive, strlen(driver->recursive));
1026 + driver = find_ll_merge_driver(merge_attr);
1027 + }
1028 merge_status = driver->fn(driver, a->path,
1029 &orig, &src1, name1, &src2, name2,
1030 result_buf);