summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-19 02:22:57 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-19 02:22:57 (GMT)
commitd56dbd67097a84dac1dbdf28c1a254f63f93724a (patch)
tree650a39920637cfdec709ab39fa0a61c9e8050789 /merge-recursive.c
parent15ba3af2d5056313fa19ceb0cb7f7cb3cdd54f16 (diff)
downloadgit-d56dbd67097a84dac1dbdf28c1a254f63f93724a.zip
git-d56dbd67097a84dac1dbdf28c1a254f63f93724a.tar.gz
git-d56dbd67097a84dac1dbdf28c1a254f63f93724a.tar.bz2
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>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 65c018b..96e461c 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);