diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 00:20:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 16:10:06 -0700 |
| commit | 7976721d171e17330486b403e868b594cd238295 (patch) | |
| tree | b0a9b7a2921b96dcd3d34e99918389edc2402d79 /builtin/merge-tree.c | |
| parent | 7c48b27822b280222be1df7ec9f9e98d688f933b (diff) | |
| download | git-7976721d171e17330486b403e868b594cd238295.tar.gz | |
merge-tree: add a --allow-unrelated-histories flag
Folks may want to merge histories that have no common ancestry; provide
a flag with the same name as used by `git merge` to allow this.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
| -rw-r--r-- | builtin/merge-tree.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index c159e31774..ae5782917b 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -399,6 +399,7 @@ enum mode { struct merge_tree_options { int mode; + int allow_unrelated_histories; int show_messages; int name_only; }; @@ -434,7 +435,7 @@ static int real_merge(struct merge_tree_options *o, * merge_incore_recursive in merge-ort.h */ merge_bases = get_merge_bases(parent1, parent2); - if (!merge_bases) + if (!merge_bases && !o->allow_unrelated_histories) die(_("refusing to merge unrelated histories")); merge_bases = reverse_commit_list(merge_bases); @@ -500,6 +501,10 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix) &o.name_only, N_("list filenames without modes/oids/stages"), PARSE_OPT_NONEG), + OPT_BOOL_F(0, "allow-unrelated-histories", + &o.allow_unrelated_histories, + N_("allow merging unrelated histories"), + PARSE_OPT_NONEG), OPT_END() }; |