mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
![Elijah Newren](/assets/img/avatar_default.png)
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>
173 lines
4.2 KiB
Bash
Executable file
173 lines
4.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='merging when a directory was replaced with a symlink'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'create a commit where dir a/b changed to symlink' '
|
|
mkdir -p a/b/c a/b-2/c &&
|
|
> a/b/c/d &&
|
|
> a/b-2/c/d &&
|
|
> a/x &&
|
|
git add -A &&
|
|
git commit -m base &&
|
|
git tag start &&
|
|
rm -rf a/b &&
|
|
git add -A &&
|
|
test_ln_s_add b-2 a/b &&
|
|
git commit -m "dir to symlink"
|
|
'
|
|
|
|
test_expect_success 'checkout does not clobber untracked symlink' '
|
|
git checkout HEAD^0 &&
|
|
git reset --hard master &&
|
|
git rm --cached a/b &&
|
|
git commit -m "untracked symlink remains" &&
|
|
test_must_fail git checkout start^0
|
|
'
|
|
|
|
test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' '
|
|
git checkout HEAD^0 &&
|
|
git reset --hard master &&
|
|
git rm --cached a/b &&
|
|
git commit -m "untracked symlink remains" &&
|
|
git checkout -f start^0 &&
|
|
test_path_is_file a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success 'checkout should not have deleted a/b-2/c/d' '
|
|
git checkout HEAD^0 &&
|
|
git reset --hard master &&
|
|
git checkout start^0 &&
|
|
test_path_is_file a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success 'setup for merge test' '
|
|
git reset --hard &&
|
|
test_path_is_file a/b-2/c/d &&
|
|
echo x > a/x &&
|
|
git add a/x &&
|
|
git commit -m x &&
|
|
git tag baseline
|
|
'
|
|
|
|
test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)' '
|
|
git reset --hard &&
|
|
git checkout baseline^0 &&
|
|
git merge -s resolve master &&
|
|
test_path_is_file a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'a/b was resolved as symlink' '
|
|
test -h a/b
|
|
'
|
|
|
|
test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)' '
|
|
git reset --hard &&
|
|
git checkout baseline^0 &&
|
|
git merge -s recursive master &&
|
|
test_path_is_file a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'a/b was resolved as symlink' '
|
|
test -h a/b
|
|
'
|
|
|
|
test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)' '
|
|
git reset --hard &&
|
|
git checkout master^0 &&
|
|
git merge -s resolve baseline^0 &&
|
|
test_path_is_file a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'a/b was resolved as symlink' '
|
|
test -h a/b
|
|
'
|
|
|
|
test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '
|
|
git reset --hard &&
|
|
git checkout master^0 &&
|
|
git merge -s recursive baseline^0 &&
|
|
test_path_is_file a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'a/b was resolved as symlink' '
|
|
test -h a/b
|
|
'
|
|
|
|
test_expect_failure 'do not lose untracked in merge (resolve)' '
|
|
git reset --hard &&
|
|
git checkout baseline^0 &&
|
|
>a/b/c/e &&
|
|
test_must_fail git merge -s resolve master &&
|
|
test_path_is_file a/b/c/e &&
|
|
test_path_is_file a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success 'do not lose untracked in merge (recursive)' '
|
|
git reset --hard &&
|
|
git checkout baseline^0 &&
|
|
>a/b/c/e &&
|
|
test_must_fail git merge -s recursive master &&
|
|
test_path_is_file a/b/c/e &&
|
|
test_path_is_file a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success 'do not lose modifications in merge (resolve)' '
|
|
git reset --hard &&
|
|
git checkout baseline^0 &&
|
|
echo more content >>a/b/c/d &&
|
|
test_must_fail git merge -s resolve master
|
|
'
|
|
|
|
test_expect_success 'do not lose modifications in merge (recursive)' '
|
|
git reset --hard &&
|
|
git checkout baseline^0 &&
|
|
echo more content >>a/b/c/d &&
|
|
test_must_fail git merge -s recursive master
|
|
'
|
|
|
|
test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
|
|
git reset --hard &&
|
|
git checkout start^0 &&
|
|
rm -rf a/b-2 &&
|
|
git add -A &&
|
|
test_ln_s_add b a/b-2 &&
|
|
git commit -m "dir a/b-2 to symlink" &&
|
|
git tag test2
|
|
'
|
|
|
|
test_expect_success 'merge should not have D/F conflicts (resolve)' '
|
|
git reset --hard &&
|
|
git checkout baseline^0 &&
|
|
git merge -s resolve test2 &&
|
|
test_path_is_file a/b/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
|
|
test -h a/b-2
|
|
'
|
|
|
|
test_expect_success 'merge should not have D/F conflicts (recursive)' '
|
|
git reset --hard &&
|
|
git checkout baseline^0 &&
|
|
git merge -s recursive test2 &&
|
|
test_path_is_file a/b/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
|
|
test -h a/b-2
|
|
'
|
|
|
|
test_expect_success 'merge should not have F/D conflicts (recursive)' '
|
|
git reset --hard &&
|
|
git checkout -b foo test2 &&
|
|
git merge -s recursive baseline^0 &&
|
|
test_path_is_file a/b/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
|
|
test -h a/b-2
|
|
'
|
|
|
|
test_done
|