Merge branch 'jt/http-redact-cookies' into maint
[git.git] / builtin / merge-file.c
blobb08803e61119a569e2ca5a33402666d8978d9ff0
1 #include "builtin.h"
2 #include "cache.h"
3 #include "config.h"
4 #include "xdiff/xdiff.h"
5 #include "xdiff-interface.h"
6 #include "parse-options.h"
8 static const char *const merge_file_usage[] = {
9 N_("git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>"),
10 NULL
13 static int label_cb(const struct option *opt, const char *arg, int unset)
15 static int label_count = 0;
16 const char **names = (const char **)opt->value;
18 if (label_count >= 3)
19 return error("too many labels on the command line");
20 names[label_count++] = arg;
21 return 0;
24 int cmd_merge_file(int argc, const char **argv, const char *prefix)
26 const char *names[3] = { NULL, NULL, NULL };
27 mmfile_t mmfs[3];
28 mmbuffer_t result = {NULL, 0};
29 xmparam_t xmp = {{0}};
30 int ret = 0, i = 0, to_stdout = 0;
31 int quiet = 0;
32 struct option options[] = {
33 OPT_BOOL('p', "stdout", &to_stdout, N_("send results to standard output")),
34 OPT_SET_INT(0, "diff3", &xmp.style, N_("use a diff3 based merge"), XDL_MERGE_DIFF3),
35 OPT_SET_INT(0, "ours", &xmp.favor, N_("for conflicts, use our version"),
36 XDL_MERGE_FAVOR_OURS),
37 OPT_SET_INT(0, "theirs", &xmp.favor, N_("for conflicts, use their version"),
38 XDL_MERGE_FAVOR_THEIRS),
39 OPT_SET_INT(0, "union", &xmp.favor, N_("for conflicts, use a union version"),
40 XDL_MERGE_FAVOR_UNION),
41 OPT_INTEGER(0, "marker-size", &xmp.marker_size,
42 N_("for conflicts, use this marker size")),
43 OPT__QUIET(&quiet, N_("do not warn about conflicts")),
44 OPT_CALLBACK('L', NULL, names, N_("name"),
45 N_("set labels for file1/orig-file/file2"), &label_cb),
46 OPT_END(),
49 xmp.level = XDL_MERGE_ZEALOUS_ALNUM;
50 xmp.style = 0;
51 xmp.favor = 0;
53 if (startup_info->have_repository) {
54 /* Read the configuration file */
55 git_config(git_xmerge_config, NULL);
56 if (0 <= git_xmerge_style)
57 xmp.style = git_xmerge_style;
60 argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0);
61 if (argc != 3)
62 usage_with_options(merge_file_usage, options);
63 if (quiet) {
64 if (!freopen("/dev/null", "w", stderr))
65 return error_errno("failed to redirect stderr to /dev/null");
68 for (i = 0; i < 3; i++) {
69 char *fname;
70 int ret;
72 if (!names[i])
73 names[i] = argv[i];
75 fname = prefix_filename(prefix, argv[i]);
76 ret = read_mmfile(mmfs + i, fname);
77 free(fname);
78 if (ret)
79 return -1;
81 if (mmfs[i].size > MAX_XDIFF_SIZE ||
82 buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
83 return error("Cannot merge binary files: %s",
84 argv[i]);
87 xmp.ancestor = names[1];
88 xmp.file1 = names[0];
89 xmp.file2 = names[2];
90 ret = xdl_merge(mmfs + 1, mmfs + 0, mmfs + 2, &xmp, &result);
92 for (i = 0; i < 3; i++)
93 free(mmfs[i].ptr);
95 if (ret >= 0) {
96 const char *filename = argv[0];
97 char *fpath = prefix_filename(prefix, argv[0]);
98 FILE *f = to_stdout ? stdout : fopen(fpath, "wb");
100 if (!f)
101 ret = error_errno("Could not open %s for writing",
102 filename);
103 else if (result.size &&
104 fwrite(result.ptr, result.size, 1, f) != 1)
105 ret = error_errno("Could not write to %s", filename);
106 else if (fclose(f))
107 ret = error_errno("Could not close %s", filename);
108 free(result.ptr);
109 free(fpath);
112 if (ret > 127)
113 ret = 127;
115 return ret;