]>
Commit | Line | Data |
---|---|---|
ba1f5f35 JS |
1 | #include "cache.h" |
2 | #include "xdiff/xdiff.h" | |
7cab5883 | 3 | #include "xdiff-interface.h" |
ba1f5f35 JS |
4 | |
5 | static const char merge_file_usage[] = | |
fbe0b24c | 6 | "git merge-file [-p | --stdout] [-q | --quiet] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"; |
ba1f5f35 | 7 | |
ba1f5f35 JS |
8 | int cmd_merge_file(int argc, char **argv, char **envp) |
9 | { | |
10 | char *names[3]; | |
11 | mmfile_t mmfs[3]; | |
12 | mmbuffer_t result = {NULL, 0}; | |
13 | xpparam_t xpp = {XDF_NEED_MINIMAL}; | |
fbe0b24c | 14 | int ret = 0, i = 0, to_stdout = 0; |
ba1f5f35 JS |
15 | |
16 | while (argc > 4) { | |
fbe0b24c | 17 | if (!strcmp(argv[1], "-L") && i < 3) { |
ba1f5f35 | 18 | names[i++] = argv[2]; |
fbe0b24c JS |
19 | argc--; |
20 | argv++; | |
21 | } else if (!strcmp(argv[1], "-p") || | |
22 | !strcmp(argv[1], "--stdout")) | |
23 | to_stdout = 1; | |
24 | else if (!strcmp(argv[1], "-q") || | |
25 | !strcmp(argv[1], "--quiet")) | |
26 | freopen("/dev/null", "w", stderr); | |
27 | else | |
28 | usage(merge_file_usage); | |
29 | argc--; | |
30 | argv++; | |
ba1f5f35 JS |
31 | } |
32 | ||
33 | if (argc != 4) | |
34 | usage(merge_file_usage); | |
35 | ||
36 | for (; i < 3; i++) | |
37 | names[i] = argv[i + 1]; | |
38 | ||
39 | for (i = 0; i < 3; i++) | |
7cab5883 | 40 | if (read_mmfile(mmfs + i, argv[i + 1])) |
ba1f5f35 JS |
41 | return -1; |
42 | ||
43 | ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2], | |
44 | &xpp, XDL_MERGE_ZEALOUS, &result); | |
45 | ||
46 | for (i = 0; i < 3; i++) | |
47 | free(mmfs[i].ptr); | |
48 | ||
49 | if (ret >= 0) { | |
50 | char *filename = argv[1]; | |
fbe0b24c | 51 | FILE *f = to_stdout ? stdout : fopen(filename, "wb"); |
ba1f5f35 JS |
52 | |
53 | if (!f) | |
54 | ret = error("Could not open %s for writing", filename); | |
55 | else if (fwrite(result.ptr, result.size, 1, f) != 1) | |
56 | ret = error("Could not write to %s", filename); | |
57 | else if (fclose(f)) | |
58 | ret = error("Could not close %s", filename); | |
59 | free(result.ptr); | |
60 | } | |
61 | ||
62 | return ret; | |
63 | } |