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>

diff --git a/merge-recursive.c b/merge-recursive.c
index 65c018b3ea504036091a03a4e6bb12b1c0011f6e..96e461c73724b2fdb54aa3638b2a6dbcf390ccd7 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1024,13 +1024,8 @@ static int ll_merge(mmbuffer_t *result_buf,
        ll_driver_name = git_path_check_merge(a->path);
        driver = find_ll_merge_driver(ll_driver_name);
 
        ll_driver_name = git_path_check_merge(a->path);
        driver = find_ll_merge_driver(ll_driver_name);
 

-       if (index_only && driver->recursive) {
-               void *merge_attr;
-
-               ll_driver_name = driver->recursive;
-               merge_attr = git_attr(ll_driver_name, strlen(ll_driver_name));
-               driver = find_ll_merge_driver(merge_attr);
-       }
+       if (index_only && driver->recursive)
+               driver = find_ll_merge_driver(driver->recursive);

        merge_status = driver->fn(driver, a->path,
                                  &orig, &src1, name1, &src2, name2,
                                  result_buf);
        merge_status = driver->fn(driver, a->path,
                                  &orig, &src1, name1, &src2, name2,
                                  result_buf);