1e92510026b552d521c178813f50f4358039e98f
1#include "builtin.h"
2#include "cache.h"
3#include "xdiff/xdiff.h"
4#include "xdiff-interface.h"
5
6static const char merge_file_usage[] =
7"git merge-file [-p | --stdout] [--diff3] [-q | --quiet] [-L name1 [-L orig [-L name2]]] file1 orig_file file2";
8
9int cmd_merge_file(int argc, const char **argv, const char *prefix)
10{
11 const char *names[3];
12 mmfile_t mmfs[3];
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;
17 int merge_style = 0;
18
19 while (argc > 4) {
20 if (!strcmp(argv[1], "-L") && i < 3) {
21 names[i++] = argv[2];
22 argc--;
23 argv++;
24 } else if (!strcmp(argv[1], "-p") ||
25 !strcmp(argv[1], "--stdout"))
26 to_stdout = 1;
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 else
33 usage(merge_file_usage);
34 argc--;
35 argv++;
36 }
37
38 if (argc != 4)
39 usage(merge_file_usage);
40
41 for (; i < 3; i++)
42 names[i] = argv[i + 1];
43
44 for (i = 0; i < 3; i++) {
45 if (read_mmfile(mmfs + i, argv[i + 1]))
46 return -1;
47 if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
48 return error("Cannot merge binary files: %s\n",
49 argv[i + 1]);
50 }
51
52 ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
53 &xpp, merge_level | merge_style, &result);
54
55 for (i = 0; i < 3; i++)
56 free(mmfs[i].ptr);
57
58 if (ret >= 0) {
59 const char *filename = argv[1];
60 FILE *f = to_stdout ? stdout : fopen(filename, "wb");
61
62 if (!f)
63 ret = error("Could not open %s for writing", filename);
64 else if (result.size &&
65 fwrite(result.ptr, result.size, 1, f) != 1)
66 ret = error("Could not write to %s", filename);
67 else if (fclose(f))
68 ret = error("Could not close %s", filename);
69 free(result.ptr);
70 }
71
72 return ret;
73}