kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge-recursive: use strbuf_expand() instead of interpolate() 

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
René Scharfe 2008-11-23 00:13:00 +01:00 committed by Junio C Hamano
parent 9b864e730b
commit ced621b2c1
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ll-merge.c
View File

@ -8,7 +8,6 @@
#include "attr.h" #include "attr.h"
#include "xdiff-interface.h" #include "xdiff-interface.h"
#include "run-command.h" #include "run-command.h"
#include "interpolate.h"
#include "ll-merge.h" #include "ll-merge.h"


struct ll_merge_driver; struct ll_merge_driver;
@ -169,11 +168,12 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
int virtual_ancestor) int virtual_ancestor)
{ {
char temp[3][50]; char temp[3][50];
char cmdbuf[2048]; struct strbuf cmd = STRBUF_INIT;
struct interp table[] = { struct strbuf_expand_dict_entry dict[] = {
{ "%O" }, { "O", temp[0] },
{ "%A" }, { "A", temp[1] },
{ "%B" }, { "B", temp[2] },
{ NULL }
}; };
struct child_process child; struct child_process child;
const char *args[20]; const char *args[20];
@ -189,17 +189,13 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
create_temp(src1, temp[1]); create_temp(src1, temp[1]);
create_temp(src2, temp[2]); create_temp(src2, temp[2]);


interp_set_entry(table, 0, temp[0]); strbuf_expand(&cmd, fn->cmdline, strbuf_expand_dict_cb, &dict);
interp_set_entry(table, 1, temp[1]);
interp_set_entry(table, 2, temp[2]);

interpolate(cmdbuf, sizeof(cmdbuf), fn->cmdline, table, 3);


memset(&child, 0, sizeof(child)); memset(&child, 0, sizeof(child));
child.argv = args; child.argv = args;
args[0] = "sh"; args[0] = "sh";
args[1] = "-c"; args[1] = "-c";
args[2] = cmdbuf; args[2] = cmd.buf;
args[3] = NULL; args[3] = NULL;


status = run_command(&child); status = run_command(&child);
@ -224,6 +220,7 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
bad: bad:
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
unlink(temp[i]); unlink(temp[i]);
strbuf_release(&cmd);
return status; return status;
} }



1
merge-recursive.c
View File

@ -16,7 +16,6 @@
#include "string-list.h" #include "string-list.h"
#include "xdiff-interface.h" #include "xdiff-interface.h"
#include "ll-merge.h" #include "ll-merge.h"
#include "interpolate.h"
#include "attr.h" #include "attr.h"
#include "merge-recursive.h" #include "merge-recursive.h"
#include "dir.h" #include "dir.h"