f222bd34ff
Remove untracked files that are unwanted after they are done being used. While the set of cases in this patch is certainly far from comprehensive, it was motivated by some work to see what the fallout would be if we were to make the removal of untracked files as a side effect of other commands into an error. Some cases were a bit more involved than the testcase changes included in this patch, but the ones included here represent the simple cases. While this patch is not that important since we are not changing the behavior of those other commands into an error in the near term, I thought these changes were useful anyway as an explicit documentation of the intent that these untracked files are no longer useful. Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Acked-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
178 lines
4.3 KiB
Bash
Executable File
178 lines
4.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='merging when a directory was replaced with a symlink'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./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 main &&
|
|
git rm --cached a/b &&
|
|
git commit -m "untracked symlink remains" &&
|
|
test_must_fail git checkout start^0 &&
|
|
git clean -fd # Do not leave the untracked symlink in the way
|
|
'
|
|
|
|
test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' '
|
|
git checkout HEAD^0 &&
|
|
git reset --hard main &&
|
|
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 &&
|
|
git clean -fd # Do not leave the untracked symlink in the way
|
|
'
|
|
|
|
test_expect_success 'checkout should not have deleted a/b-2/c/d' '
|
|
git checkout HEAD^0 &&
|
|
git reset --hard main &&
|
|
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 main &&
|
|
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 main &&
|
|
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 main^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 main^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 main &&
|
|
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 main &&
|
|
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 main
|
|
'
|
|
|
|
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 main
|
|
'
|
|
|
|
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
|