Skip to content

Commit

Permalink
merge-recursive: use strbuf_expand() instead of interpolate()
Browse files Browse the repository at this point in the history
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
René Scharfe authored and gitster committed Nov 24, 2008
1 parent 9b864e7 commit ced621b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
21 changes: 9 additions & 12 deletions ll-merge.c
Expand Up @@ -8,7 +8,6 @@
#include "attr.h"
#include "xdiff-interface.h"
#include "run-command.h"
#include "interpolate.h"
#include "ll-merge.h"

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

interp_set_entry(table, 0, temp[0]);
interp_set_entry(table, 1, temp[1]);
interp_set_entry(table, 2, temp[2]);

interpolate(cmdbuf, sizeof(cmdbuf), fn->cmdline, table, 3);
strbuf_expand(&cmd, fn->cmdline, strbuf_expand_dict_cb, &dict);

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

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

Expand Down
1 change: 0 additions & 1 deletion merge-recursive.c
Expand Up @@ -16,7 +16,6 @@
#include "string-list.h"
#include "xdiff-interface.h"
#include "ll-merge.h"
#include "interpolate.h"
#include "attr.h"
#include "merge-recursive.h"
#include "dir.h"
Expand Down

0 comments on commit ced621b

Please sign in to comment.