From: Junio C Hamano <junkio@cox.net>
Date: Thu, 19 Apr 2007 02:22:57 +0000 (-0700)
Subject: Simplify code to find recursive merge driver.
X-Git-Tag: v1.5.2-rc0~18^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d56dbd67097a84dac1dbdf28c1a254f63f93724a;p=git.git

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 65c018b3e..96e461c73 100644
--- 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);
 
-	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);