Simplify code to find recursive merge driver.
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>
Junio C Hamano committed
Apr 18, 2007 at 19:22 UTC
d56dbd67097a84dac1dbdf28c1a254f63f93724a
1 file changed
+2
-7
merge-recursive.c
+2
-7
@@ -1024,13 +1024,8 @@ static int ll_merge(mmbuffer_t *result_buf,
1024
ll_driver_name = git_path_check_merge(a->path);
1025
driver = find_ll_merge_driver(ll_driver_name);
1026
1027
- if (index_only && driver->recursive) {
1028
- void *merge_attr;
1029
-
1030
- ll_driver_name = driver->recursive;
1031
- merge_attr = git_attr(ll_driver_name, strlen(ll_driver_name));
1032
- driver = find_ll_merge_driver(merge_attr);
1033
- }
1027
+ if (index_only && driver->recursive)
1028
+ driver = find_ll_merge_driver(driver->recursive);
1029
merge_status = driver->fn(driver, a->path,
1030
&orig, &src1, name1, &src2, name2,
1031
result_buf);