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

rerere: use ll_merge() instead of using xdl_merge()

Browse Source 
This allows us to pay attention to the attribute settings and custom
merge driver the user sets up.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2010-01-15 22:50:01 -08:00
parent 15b4f7a68d
commit 88533f6d64
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rerere.c
View File

@ -1,7 +1,6 @@
#include "cache.h" #include "cache.h"
#include "string-list.h" #include "string-list.h"
#include "rerere.h" #include "rerere.h"
#include "xdiff/xdiff.h"
#include "xdiff-interface.h" #include "xdiff-interface.h"
#include "dir.h" #include "dir.h"
#include "resolve-undo.h" #include "resolve-undo.h"
@ -332,7 +331,6 @@ static int merge(const char *name, const char *path)
int ret; int ret;
mmfile_t cur, base, other; mmfile_t cur, base, other;
mmbuffer_t result = {NULL, 0}; mmbuffer_t result = {NULL, 0};
xmparam_t xmp = {{XDF_NEED_MINIMAL}};
if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0) if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0)
return 1; return 1;
@ -341,8 +339,7 @@ static int merge(const char *name, const char *path)
read_mmfile(&base, rerere_path(name, "preimage")) || read_mmfile(&base, rerere_path(name, "preimage")) ||
read_mmfile(&other, rerere_path(name, "postimage"))) read_mmfile(&other, rerere_path(name, "postimage")))
return 1; return 1;
ret = xdl_merge(&base, &cur, "", &other, "", ret = ll_merge(&result, path, &base, &cur, "", &other, "", 0);
&xmp, XDL_MERGE_ZEALOUS, &result);
if (!ret) { if (!ret) {
FILE *f = fopen(path, "w"); FILE *f = fopen(path, "w");
if (!f) if (!f)