mirror of
https://github.com/git/git.git
synced 2024-11-17 06:25:13 +01:00
73eb40eeaa
Sometimes people want their conflicting merges autoresolved by favouring upstream changes. The standard answer they are given is to run "git diff --name-only | xargs git checkout MERGE_HEAD --" in such a case. This is to accept automerge results for the paths that are fully resolved automatically, while taking their version of the file in full for paths that have conflicts. This is problematic on two counts. One is that this is not exactly what these people want. It discards all changes they did on their branch for any paths that conflicted. They usually want to salvage as much automerge result as possible in a conflicted file, and want to take the upstream change only in the conflicted part. This patch teaches two new modes of operation to the lowest-lever merge machinery, xdl_merge(). Instead of leaving the conflicted lines from both sides enclosed in <<<, ===, and >>> markers, the conflicts are resolved favouring our side or their side of changes. A larger problem is that this tends to encourage a bad workflow by allowing people to record such a mixed up half-merged result as a full commit without auditing. This commit does not tackle this issue at all. In git, we usually give long enough rope to users with strange wishes as long as the risky features are not enabled by default, and this is such a risky feature. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
96 lines
2.7 KiB
C
96 lines
2.7 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "xdiff/xdiff.h"
|
|
#include "xdiff-interface.h"
|
|
#include "parse-options.h"
|
|
|
|
static const char *const merge_file_usage[] = {
|
|
"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2",
|
|
NULL
|
|
};
|
|
|
|
static int label_cb(const struct option *opt, const char *arg, int unset)
|
|
{
|
|
static int label_count = 0;
|
|
const char **names = (const char **)opt->value;
|
|
|
|
if (label_count >= 3)
|
|
return error("too many labels on the command line");
|
|
names[label_count++] = arg;
|
|
return 0;
|
|
}
|
|
|
|
int cmd_merge_file(int argc, const char **argv, const char *prefix)
|
|
{
|
|
const char *names[3] = { NULL, NULL, NULL };
|
|
mmfile_t mmfs[3];
|
|
mmbuffer_t result = {NULL, 0};
|
|
xpparam_t xpp = {XDF_NEED_MINIMAL};
|
|
int ret = 0, i = 0, to_stdout = 0;
|
|
int level = XDL_MERGE_ZEALOUS_ALNUM;
|
|
int style = 0, quiet = 0;
|
|
int favor = 0;
|
|
int nongit;
|
|
|
|
struct option options[] = {
|
|
OPT_BOOLEAN('p', "stdout", &to_stdout, "send results to standard output"),
|
|
OPT_SET_INT(0, "diff3", &style, "use a diff3 based merge", XDL_MERGE_DIFF3),
|
|
OPT_SET_INT(0, "ours", &favor, "for conflicts, use our version",
|
|
XDL_MERGE_FAVOR_OURS),
|
|
OPT_SET_INT(0, "theirs", &favor, "for conflicts, use their version",
|
|
XDL_MERGE_FAVOR_THEIRS),
|
|
OPT__QUIET(&quiet),
|
|
OPT_CALLBACK('L', NULL, names, "name",
|
|
"set labels for file1/orig_file/file2", &label_cb),
|
|
OPT_END(),
|
|
};
|
|
|
|
prefix = setup_git_directory_gently(&nongit);
|
|
if (!nongit) {
|
|
/* Read the configuration file */
|
|
git_config(git_xmerge_config, NULL);
|
|
if (0 <= git_xmerge_style)
|
|
style = git_xmerge_style;
|
|
}
|
|
|
|
argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0);
|
|
if (argc != 3)
|
|
usage_with_options(merge_file_usage, options);
|
|
if (quiet) {
|
|
if (!freopen("/dev/null", "w", stderr))
|
|
return error("failed to redirect stderr to /dev/null: "
|
|
"%s\n", strerror(errno));
|
|
}
|
|
|
|
for (i = 0; i < 3; i++) {
|
|
if (!names[i])
|
|
names[i] = argv[i];
|
|
if (read_mmfile(mmfs + i, argv[i]))
|
|
return -1;
|
|
if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
|
|
return error("Cannot merge binary files: %s\n",
|
|
argv[i]);
|
|
}
|
|
|
|
ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
|
|
&xpp, XDL_MERGE_FLAGS(level, style, favor), &result);
|
|
|
|
for (i = 0; i < 3; i++)
|
|
free(mmfs[i].ptr);
|
|
|
|
if (ret >= 0) {
|
|
const char *filename = argv[0];
|
|
FILE *f = to_stdout ? stdout : fopen(filename, "wb");
|
|
|
|
if (!f)
|
|
ret = error("Could not open %s for writing", filename);
|
|
else if (result.size &&
|
|
fwrite(result.ptr, result.size, 1, f) != 1)
|
|
ret = error("Could not write to %s", filename);
|
|
else if (fclose(f))
|
|
ret = error("Could not close %s", filename);
|
|
free(result.ptr);
|
|
}
|
|
|
|
return ret;
|
|
}
|