mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify code to find recursive merge driver.

Browse Source 
There is no need to intern the string to git_attr, as we are already
dealing with the name of the driver there.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2007-04-18 19:22:57 -07:00
parent 15ba3af2d5
commit d56dbd6709
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
merge-recursive.c
View File

@ -1024,13 +1024,8 @@ static int ll_merge(mmbuffer_t *result_buf,
ll_driver_name = git_path_check_merge(a->path); ll_driver_name = git_path_check_merge(a->path);
driver = find_ll_merge_driver(ll_driver_name); driver = find_ll_merge_driver(ll_driver_name);
if (index_only && driver->recursive) { if (index_only && driver->recursive)
void *merge_attr; driver = find_ll_merge_driver(driver->recursive);
ll_driver_name = driver->recursive;
merge_attr = git_attr(ll_driver_name, strlen(ll_driver_name));
driver = find_ll_merge_driver(merge_attr);
}
merge_status = driver->fn(driver, a->path, merge_status = driver->fn(driver, a->path,
&orig, &src1, name1, &src2, name2, &orig, &src1, name1, &src2, name2,
result_buf); result_buf);