]>
git.ipfire.org Git - thirdparty/git.git/blob - builtin-merge-file.c
3 #include "xdiff/xdiff.h"
4 #include "xdiff-interface.h"
6 static const char merge_file_usage
[] =
7 "git merge-file [-p | --stdout] [--diff3] [-q | --quiet] [-L name1 [-L orig [-L name2]]] file1 orig_file file2";
9 int cmd_merge_file(int argc
, const char **argv
, const char *prefix
)
13 mmbuffer_t result
= {NULL
, 0};
14 xpparam_t xpp
= {XDF_NEED_MINIMAL
};
15 int ret
= 0, i
= 0, to_stdout
= 0;
16 int merge_level
= XDL_MERGE_ZEALOUS_ALNUM
;
20 if (!strcmp(argv
[1], "-L") && i
< 3) {
24 } else if (!strcmp(argv
[1], "-p") ||
25 !strcmp(argv
[1], "--stdout"))
27 else if (!strcmp(argv
[1], "-q") ||
28 !strcmp(argv
[1], "--quiet"))
29 freopen("/dev/null", "w", stderr
);
30 else if (!strcmp(argv
[1], "--diff3")) {
31 merge_style
= XDL_MERGE_DIFF3
;
32 merge_level
= XDL_MERGE_EAGER
;
35 usage(merge_file_usage
);
41 usage(merge_file_usage
);
44 names
[i
] = argv
[i
+ 1];
46 for (i
= 0; i
< 3; i
++) {
47 if (read_mmfile(mmfs
+ i
, argv
[i
+ 1]))
49 if (buffer_is_binary(mmfs
[i
].ptr
, mmfs
[i
].size
))
50 return error("Cannot merge binary files: %s\n",
54 ret
= xdl_merge(mmfs
+ 1, mmfs
+ 0, names
[0], mmfs
+ 2, names
[2],
55 &xpp
, merge_level
| merge_style
, &result
);
57 for (i
= 0; i
< 3; i
++)
61 const char *filename
= argv
[1];
62 FILE *f
= to_stdout
? stdout
: fopen(filename
, "wb");
65 ret
= error("Could not open %s for writing", filename
);
66 else if (result
.size
&&
67 fwrite(result
.ptr
, result
.size
, 1, f
) != 1)
68 ret
= error("Could not write to %s", filename
);
70 ret
= error("Could not close %s", filename
);