undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2007-04-18 12:18:25 -07:00
parent 153920da5b
commit 3086486d32
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
merge-recursive.c
View File

@ -677,6 +677,7 @@ struct ll_merge_driver {
const char *name;
const char *description;
ll_merge_fn fn;
const char *recursive;
struct ll_merge_driver *next;
char *cmdline;
};
@ -934,6 +935,13 @@ static int read_merge_config(const char *var, const char *value)
return 0;
}
if (!strcmp("recursive", ep)) {
if (!value)
return error("%s: lacks value", var);
fn->recursive = strdup(value);
return 0;
}
return 0;
}
@ -1013,6 +1021,10 @@ static int ll_merge(mmbuffer_t *result_buf,
merge_attr = git_path_check_merge(a->path);
driver = find_ll_merge_driver(merge_attr);
if (index_only && driver->recursive) {
merge_attr = git_attr(driver->recursive, strlen(driver->recursive));
driver = find_ll_merge_driver(merge_attr);
}
merge_status = driver->fn(driver, a->path,
&orig, &src1, name1, &src2, name2,
result_buf);