mirror of
https://github.com/git/git.git
synced 2024-11-20 07:54:51 +01:00
a2c6726417
* ab/test-2: (51 commits) tests: factor HOME=$(pwd) in test-lib.sh test-lib: use subshell instead of cd $new && .. && cd $old tests: simplify "missing PREREQ" message t/t0000-basic.sh: Run the passing TODO test inside its own test-lib test-lib: Allow overriding of TEST_DIRECTORY test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../ test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../ test: Introduce $GIT_BUILD_DIR cvs tests: do not touch test CVS repositories shipped with source t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite t/t7105-reset-patch.sh: Add a PERL prerequisite t/t9001-send-email.sh: convert setup code to tests t/t9001-send-email.sh: change from skip_all=* to prereq skip t/t9001-send-email.sh: Remove needless PROG=* assignment t/t9600-cvsimport.sh: change from skip_all=* to prereq skip lib-patch-mode tests: change from skip_all=* to prereq skip t/t3701-add-interactive.sh: change from skip_all=* to prereq skip tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh t/Makefile: Create test-results dir for smoke target ... Conflicts: t/t6035-merge-dir-to-symlink.sh
143 lines
3.5 KiB
Bash
Executable file
143 lines
3.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='merging when a directory was replaced with a symlink'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success SYMLINKS '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 &&
|
|
ln -s b-2 a/b &&
|
|
git add -A &&
|
|
git commit -m "dir to symlink"
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'keep a/b-2/c/d across checkout' '
|
|
git checkout HEAD^0 &&
|
|
git reset --hard master &&
|
|
git rm --cached a/b &&
|
|
git commit -m "untracked symlink remains" &&
|
|
git checkout start^0 &&
|
|
test -f a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'checkout should not have deleted a/b-2/c/d' '
|
|
git checkout HEAD^0 &&
|
|
git reset --hard master &&
|
|
git checkout start^0 &&
|
|
test -f a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'setup for merge test' '
|
|
git reset --hard &&
|
|
test -f a/b-2/c/d &&
|
|
echo x > a/x &&
|
|
git add a/x &&
|
|
git commit -m x &&
|
|
git tag baseline
|
|
'
|
|
|
|
test_expect_success SYMLINKS '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 -h a/b &&
|
|
test -f a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS '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 -h a/b &&
|
|
test -f a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS '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 -h a/b &&
|
|
test -f a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS '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 -h a/b &&
|
|
test -f a/b-2/c/d
|
|
'
|
|
|
|
test_expect_failure SYMLINKS '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 -f a/b/c/e &&
|
|
test -f a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS '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 -f a/b/c/e &&
|
|
test -f a/b-2/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS '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 SYMLINKS '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 SYMLINKS 'setup a merge where dir a/b-2 changed to symlink' '
|
|
git reset --hard &&
|
|
git checkout start^0 &&
|
|
rm -rf a/b-2 &&
|
|
ln -s b a/b-2 &&
|
|
git add -A &&
|
|
git commit -m "dir a/b-2 to symlink" &&
|
|
git tag test2
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'merge should not have D/F conflicts (resolve)' '
|
|
git reset --hard &&
|
|
git checkout baseline^0 &&
|
|
git merge -s resolve test2 &&
|
|
test -h a/b-2 &&
|
|
test -f a/b/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'merge should not have D/F conflicts (recursive)' '
|
|
git reset --hard &&
|
|
git checkout baseline^0 &&
|
|
git merge -s recursive test2 &&
|
|
test -h a/b-2 &&
|
|
test -f a/b/c/d
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'merge should not have F/D conflicts (recursive)' '
|
|
git reset --hard &&
|
|
git checkout -b foo test2 &&
|
|
git merge -s recursive baseline^0 &&
|
|
test -h a/b-2 &&
|
|
test -f a/b/c/d
|
|
'
|
|
|
|
test_done
|