2009-07-29 23:02:39 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='merging when a directory was replaced with a symlink'
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success 'create a commit where dir a/b changed to symlink' '
|
2009-07-29 23:02:39 +02:00
|
|
|
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 &&
|
2013-06-07 22:53:33 +02:00
|
|
|
test_ln_s_add b-2 a/b &&
|
2009-07-29 23:02:39 +02:00
|
|
|
git commit -m "dir to symlink"
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success 'checkout does not clobber untracked symlink' '
|
2009-07-29 23:02:39 +02:00
|
|
|
git checkout HEAD^0 &&
|
|
|
|
git reset --hard master &&
|
|
|
|
git rm --cached a/b &&
|
|
|
|
git commit -m "untracked symlink remains" &&
|
2011-02-20 13:13:43 +01:00
|
|
|
test_must_fail git checkout start^0
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' '
|
2011-02-20 13:13:43 +01:00
|
|
|
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 -f a/b-2/c/d
|
2009-07-29 23:02:39 +02:00
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success 'checkout should not have deleted a/b-2/c/d' '
|
2009-07-29 23:02:39 +02:00
|
|
|
git checkout HEAD^0 &&
|
|
|
|
git reset --hard master &&
|
|
|
|
git checkout start^0 &&
|
|
|
|
test -f a/b-2/c/d
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success 'setup for merge test' '
|
2009-07-29 23:02:39 +02:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)' '
|
2009-07-29 23:02:39 +02:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout baseline^0 &&
|
|
|
|
git merge -s resolve master &&
|
|
|
|
test -f a/b-2/c/d
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
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)' '
|
2009-07-29 23:02:39 +02:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout baseline^0 &&
|
|
|
|
git merge -s recursive master &&
|
|
|
|
test -f a/b-2/c/d
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
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)' '
|
2010-07-09 15:10:51 +02:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout master^0 &&
|
|
|
|
git merge -s resolve baseline^0 &&
|
|
|
|
test -f a/b-2/c/d
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
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)' '
|
2010-07-09 15:10:51 +02:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout master^0 &&
|
|
|
|
git merge -s recursive baseline^0 &&
|
|
|
|
test -f a/b-2/c/d
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success SYMLINKS 'a/b was resolved as symlink' '
|
|
|
|
test -h a/b
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_failure 'do not lose untracked in merge (resolve)' '
|
2010-07-09 15:10:51 +02:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success 'do not lose untracked in merge (recursive)' '
|
2010-07-09 15:10:51 +02:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success 'do not lose modifications in merge (resolve)' '
|
2010-07-09 15:10:51 +02:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout baseline^0 &&
|
|
|
|
echo more content >>a/b/c/d &&
|
|
|
|
test_must_fail git merge -s resolve master
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success 'do not lose modifications in merge (recursive)' '
|
2010-07-09 15:10:51 +02:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout baseline^0 &&
|
|
|
|
echo more content >>a/b/c/d &&
|
|
|
|
test_must_fail git merge -s recursive master
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
|
2009-07-29 23:02:39 +02:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout start^0 &&
|
|
|
|
rm -rf a/b-2 &&
|
|
|
|
git add -A &&
|
2013-06-07 22:53:33 +02:00
|
|
|
test_ln_s_add b a/b-2 &&
|
2009-07-29 23:02:39 +02:00
|
|
|
git commit -m "dir a/b-2 to symlink" &&
|
|
|
|
git tag test2
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success 'merge should not have D/F conflicts (resolve)' '
|
2009-07-29 23:02:39 +02:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout baseline^0 &&
|
|
|
|
git merge -s resolve test2 &&
|
|
|
|
test -f a/b/c/d
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
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)' '
|
2009-07-29 23:02:39 +02:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout baseline^0 &&
|
|
|
|
git merge -s recursive test2 &&
|
|
|
|
test -f a/b/c/d
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
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)' '
|
2010-07-09 15:10:51 +02:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout -b foo test2 &&
|
|
|
|
git merge -s recursive baseline^0 &&
|
|
|
|
test -f a/b/c/d
|
|
|
|
'
|
|
|
|
|
2013-06-07 22:53:33 +02:00
|
|
|
test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
|
|
|
|
test -h a/b-2
|
|
|
|
'
|
|
|
|
|
2009-07-29 23:02:39 +02:00
|
|
|
test_done
|