mirror of
https://github.com/git/git
synced 2024-10-30 03:13:24 +00:00
919df31955
The tests for the merge machinery are spread over several places.
Collect them into t64xx for simplicity. Some notes:
t60[234]*.sh:
Merge tests started in t602*, overgrew bisect and remote tracking
tests in t6030, t6040, and t6041, and nearly overtook replace tests
in t6050. This made picking out relevant tests that I wanted to run
in a tighter loop slightly more annoying for years.
t303*.sh:
These started out as tests for the 'merge-recursive' toplevel command,
but did not restrict to that and had lots of overlap with the
underlying merge machinery.
t7405, t7613:
submodule-specific merge logic started out in submodule.c but was
moved to merge-recursive.c in commit 18cfc08866 ("submodule.c: move
submodule merging to merge-recursive.c", 2018-05-15). Since these
tests are about the logic found in the merge machinery, moving these
tests to be with the merge tests makes sense.
t7607, t7609:
Having tests spread all over the place makes it more likely that
additional tests related to a certain piece of logic grow in all those
other places. Much like t303*.sh, these two tests were about the
underlying merge machinery rather than outer levels.
Tests that were NOT moved:
t76[01]*.sh:
Other than the four tests mentioned above, the remaining tests in
t76[01]*.sh are related to non-recursive merge strategies, parameter
parsing, and other stuff associated with the highlevel builtin/merge.c
rather than the recursive merge machinery.
t3[45]*.sh:
The rebase testcases in t34*.sh also test the merge logic pretty
heavily; sometimes changes I make only trigger failures in the rebase
tests. The rebase tests are already nicely coupled together, though,
and I didn't want to mess that up. Similar comments apply for the
cherry-pick tests in t35*.sh.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
67 lines
1.5 KiB
Bash
Executable file
67 lines
1.5 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Fredrik Kuivinen
|
|
#
|
|
|
|
# See https://lore.kernel.org/git/Pine.LNX.4.44.0504271254120.4678-100000@wax.eds.org/ for a
|
|
# nice description of what this is about.
|
|
|
|
|
|
test_description='Test criss-cross merge'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'prepare repository' '
|
|
test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
|
|
git add file &&
|
|
git commit -m "Initial commit" file &&
|
|
|
|
git branch A &&
|
|
git branch B &&
|
|
git checkout A &&
|
|
|
|
test_write_lines 1 2 3 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
|
|
git commit -m "B8" file &&
|
|
git checkout B &&
|
|
|
|
test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 8 9 >file &&
|
|
git commit -m "C3" file &&
|
|
git branch C3 &&
|
|
|
|
git merge -m "pre E3 merge" A &&
|
|
|
|
test_write_lines 1 2 "3 changed in E3, branch B. New file size" 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
|
|
git commit -m "E3" file &&
|
|
|
|
git checkout A &&
|
|
git merge -m "pre D8 merge" C3 &&
|
|
test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 "8 changed in D8, branch A. New file size 2" 9 >file &&
|
|
|
|
git commit -m D8 file
|
|
'
|
|
|
|
test_expect_success 'Criss-cross merge' '
|
|
git merge -m "final merge" B
|
|
'
|
|
|
|
test_expect_success 'Criss-cross merge result' '
|
|
cat <<-\EOF >file-expect &&
|
|
1
|
|
2
|
|
3 changed in E3, branch B. New file size
|
|
4
|
|
5
|
|
6
|
|
7
|
|
8 changed in D8, branch A. New file size 2
|
|
9
|
|
EOF
|
|
|
|
test_cmp file-expect file
|
|
'
|
|
|
|
test_expect_success 'Criss-cross merge fails (-s resolve)' '
|
|
git reset --hard A^ &&
|
|
test_must_fail git merge -s resolve -m "final merge" B
|
|
'
|
|
|
|
test_done
|