3 #include "xdiff/xdiff.h"
4 #include "xdiff-interface.h"
5 #include "parse-options.h"
7 static const char *const merge_file_usage
[] = {
8 N_("git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"),
12 static int label_cb(const struct option
*opt
, const char *arg
, int unset
)
14 static int label_count
= 0;
15 const char **names
= (const char **)opt
->value
;
18 return error("too many labels on the command line");
19 names
[label_count
++] = arg
;
23 int cmd_merge_file(int argc
, const char **argv
, const char *prefix
)
25 const char *names
[3] = { NULL
, NULL
, NULL
};
27 mmbuffer_t result
= {NULL
, 0};
28 xmparam_t xmp
= {{0}};
29 int ret
= 0, i
= 0, to_stdout
= 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
),
49 xmp
.level
= XDL_MERGE_ZEALOUS_ALNUM
;
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);
62 usage_with_options(merge_file_usage
, options
);
64 if (!freopen("/dev/null", "w", stderr
))
65 return error("failed to redirect stderr to /dev/null: "
66 "%s", strerror(errno
));
70 prefixlen
= strlen(prefix
);
72 for (i
= 0; i
< 3; i
++) {
73 const char *fname
= prefix_filename(prefix
, prefixlen
, argv
[i
]);
76 if (read_mmfile(mmfs
+ i
, fname
))
78 if (mmfs
[i
].size
> MAX_XDIFF_SIZE
||
79 buffer_is_binary(mmfs
[i
].ptr
, mmfs
[i
].size
))
80 return error("Cannot merge binary files: %s",
84 xmp
.ancestor
= names
[1];
87 ret
= xdl_merge(mmfs
+ 1, mmfs
+ 0, mmfs
+ 2, &xmp
, &result
);
89 for (i
= 0; i
< 3; i
++)
93 const char *filename
= argv
[0];
94 const char *fpath
= prefix_filename(prefix
, prefixlen
, argv
[0]);
95 FILE *f
= to_stdout
? stdout
: fopen(fpath
, "wb");
98 ret
= error("Could not open %s for writing", filename
);
99 else if (result
.size
&&
100 fwrite(result
.ptr
, result
.size
, 1, f
) != 1)
101 ret
= error("Could not write to %s", filename
);
103 ret
= error("Could not close %s", filename
);