development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge-tree: add a --allow-unrelated-histories flag

Browse source 
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>
This commit is contained in:
Elijah Newren 2022-06-18 00:20:59 +00:00 committed by Junio C Hamano
parent 7c48b27822
commit 7976721d17
3 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Documentation/git-merge-tree.txt
View file

@ -59,6 +59,11 @@ OPTIONS
default is to include these messages if there are merge
conflicts, and to omit them otherwise.
--allow-unrelated-histories::
merge-tree will by default error out if the two branches specified
share no common history. This flag can be given to override that
check and make the merge proceed anyway.
[[OUTPUT]]
OUTPUT
------

7
builtin/merge-tree.c
View file

@ -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()
};

24
t/t4301-merge-tree-write-tree.sh
View file

@ -44,7 +44,13 @@ test_expect_success setup '
git checkout side3 &&
git mv numbers sequence &&
test_tick &&
git commit -m rename-numbers
git commit -m rename-numbers &&
git switch --orphan unrelated &&
>something-else &&
git add something-else &&
test_tick &&
git commit -m first-commit
'
test_expect_success 'Clean merge' '
@ -215,4 +221,20 @@ test_expect_success 'NUL terminated conflicted file "lines"' '
test_cmp expect actual
'
test_expect_success 'error out by default for unrelated histories' '
test_expect_code 128 git merge-tree --write-tree side1 unrelated 2>error &&
grep "refusing to merge unrelated histories" error
'
test_expect_success 'can override merge of unrelated histories' '
git merge-tree --write-tree --allow-unrelated-histories side1 unrelated >tree &&
TREE=$(cat tree) &&
git rev-parse side1:numbers side1:greeting side1:whatever unrelated:something-else >expect &&
git rev-parse $TREE:numbers $TREE:greeting $TREE:whatever $TREE:something-else >actual &&
test_cmp expect actual
'
test_done