mirror of
https://github.com/git/git
synced 2024-10-06 00:29:28 +00:00
Merge branch 'ty/merge-tree-strategy-options'
"git merge-tree" learned to take strategy backend specific options via the "-X" option, like "git merge" does. * ty/merge-tree-strategy-options: merge: introduce {copy|clear}_merge_options() merge-tree: add -X strategy option
This commit is contained in:
commit
c662038629
|
@ -18,6 +18,7 @@
|
|||
#include "quote.h"
|
||||
#include "tree.h"
|
||||
#include "config.h"
|
||||
#include "strvec.h"
|
||||
|
||||
static int line_termination = '\n';
|
||||
|
||||
|
@ -414,6 +415,7 @@ struct merge_tree_options {
|
|||
int show_messages;
|
||||
int name_only;
|
||||
int use_stdin;
|
||||
struct merge_options merge_options;
|
||||
};
|
||||
|
||||
static int real_merge(struct merge_tree_options *o,
|
||||
|
@ -423,10 +425,11 @@ static int real_merge(struct merge_tree_options *o,
|
|||
{
|
||||
struct commit *parent1, *parent2;
|
||||
struct commit_list *merge_bases = NULL;
|
||||
struct merge_options opt;
|
||||
struct merge_result result = { 0 };
|
||||
int show_messages = o->show_messages;
|
||||
struct merge_options opt;
|
||||
|
||||
copy_merge_options(&opt, &o->merge_options);
|
||||
parent1 = get_merge_parent(branch1);
|
||||
if (!parent1)
|
||||
help_unknown_ref(branch1, "merge-tree",
|
||||
|
@ -437,8 +440,6 @@ static int real_merge(struct merge_tree_options *o,
|
|||
help_unknown_ref(branch2, "merge-tree",
|
||||
_("not something we can merge"));
|
||||
|
||||
init_merge_options(&opt, the_repository);
|
||||
|
||||
opt.show_rename_progress = 0;
|
||||
|
||||
opt.branch1 = branch1;
|
||||
|
@ -507,12 +508,14 @@ static int real_merge(struct merge_tree_options *o,
|
|||
if (o->use_stdin)
|
||||
putchar(line_termination);
|
||||
merge_finalize(&opt, &result);
|
||||
clear_merge_options(&opt);
|
||||
return !result.clean; /* result.clean < 0 handled above */
|
||||
}
|
||||
|
||||
int cmd_merge_tree(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
struct merge_tree_options o = { .show_messages = -1 };
|
||||
struct strvec xopts = STRVEC_INIT;
|
||||
int expected_remaining_argc;
|
||||
int original_argc;
|
||||
const char *merge_base = NULL;
|
||||
|
@ -548,14 +551,25 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
|
|||
&merge_base,
|
||||
N_("commit"),
|
||||
N_("specify a merge-base for the merge")),
|
||||
OPT_STRVEC('X', "strategy-option", &xopts, N_("option=value"),
|
||||
N_("option for selected merge strategy")),
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
/* Init merge options */
|
||||
init_merge_options(&o.merge_options, the_repository);
|
||||
|
||||
/* Parse arguments */
|
||||
original_argc = argc - 1; /* ignoring argv[0] */
|
||||
argc = parse_options(argc, argv, prefix, mt_options,
|
||||
merge_tree_usage, PARSE_OPT_STOP_AT_NON_OPTION);
|
||||
|
||||
if (xopts.nr && o.mode == MODE_TRIVIAL)
|
||||
die(_("--trivial-merge is incompatible with all other options"));
|
||||
for (int x = 0; x < xopts.nr; x++)
|
||||
if (parse_merge_opt(&o.merge_options, xopts.v[x]))
|
||||
die(_("unknown strategy option: -X%s"), xopts.v[x]);
|
||||
|
||||
/* Handle --stdin */
|
||||
if (o.use_stdin) {
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
|
|
|
@ -3912,6 +3912,22 @@ void init_merge_options(struct merge_options *opt,
|
|||
opt->buffer_output = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* For now, members of merge_options do not need deep copying, but
|
||||
* it may change in the future, in which case we would need to update
|
||||
* this, and also make a matching change to clear_merge_options() to
|
||||
* release the resources held by a copied instance.
|
||||
*/
|
||||
void copy_merge_options(struct merge_options *dst, struct merge_options *src)
|
||||
{
|
||||
*dst = *src;
|
||||
}
|
||||
|
||||
void clear_merge_options(struct merge_options *opt UNUSED)
|
||||
{
|
||||
; /* no-op as our copy is shallow right now */
|
||||
}
|
||||
|
||||
int parse_merge_opt(struct merge_options *opt, const char *s)
|
||||
{
|
||||
const char *arg;
|
||||
|
|
|
@ -55,6 +55,9 @@ struct merge_options {
|
|||
|
||||
void init_merge_options(struct merge_options *opt, struct repository *repo);
|
||||
|
||||
void copy_merge_options(struct merge_options *dst, struct merge_options *src);
|
||||
void clear_merge_options(struct merge_options *opt);
|
||||
|
||||
/* parse the option in s and update the relevant field of opt */
|
||||
int parse_merge_opt(struct merge_options *opt, const char *s);
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@ test_expect_success setup '
|
|||
git branch side1 &&
|
||||
git branch side2 &&
|
||||
git branch side3 &&
|
||||
git branch side4 &&
|
||||
|
||||
git checkout side1 &&
|
||||
test_write_lines 1 2 3 4 5 6 >numbers &&
|
||||
|
@ -46,6 +47,13 @@ test_expect_success setup '
|
|||
test_tick &&
|
||||
git commit -m rename-numbers &&
|
||||
|
||||
git checkout side4 &&
|
||||
test_write_lines 0 1 2 3 4 5 >numbers &&
|
||||
echo yo >greeting &&
|
||||
git add numbers greeting &&
|
||||
test_tick &&
|
||||
git commit -m other-content-modifications &&
|
||||
|
||||
git switch --orphan unrelated &&
|
||||
>something-else &&
|
||||
git add something-else &&
|
||||
|
@ -97,6 +105,21 @@ test_expect_success 'Content merge and a few conflicts' '
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'Auto resolve conflicts by "ours" strategy option' '
|
||||
git checkout side1^0 &&
|
||||
|
||||
# make sure merge conflict exists
|
||||
test_must_fail git merge side4 &&
|
||||
git merge --abort &&
|
||||
|
||||
git merge -X ours side4 &&
|
||||
git rev-parse HEAD^{tree} >expected &&
|
||||
|
||||
git merge-tree -X ours side1 side4 >actual &&
|
||||
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'Barf on misspelled option, with exit code other than 0 or 1' '
|
||||
# Mis-spell with single "s" instead of double "s"
|
||||
test_expect_code 129 git merge-tree --write-tree --mesages FOOBAR side1 side2 2>expect &&
|
||||
|
|
Loading…
Reference in a new issue