mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
883b98efad
Carefully excluding t2106, which sees independent development elsewhere at the time of writing, we transition above-mentioned tests to the default branch name `main`. This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t2*.sh && git checkout HEAD -- t2106\*) This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for those tests. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
95 lines
2.5 KiB
Bash
Executable file
95 lines
2.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='checkout $tree -- $paths'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
mkdir dir &&
|
|
>dir/main &&
|
|
echo common >dir/common &&
|
|
git add dir/main dir/common &&
|
|
test_tick && git commit -m "main has dir/main" &&
|
|
git checkout -b next &&
|
|
git mv dir/main dir/next0 &&
|
|
echo next >dir/next1 &&
|
|
git add dir &&
|
|
test_tick && git commit -m "next has dir/next but not dir/main"
|
|
'
|
|
|
|
test_expect_success 'checking out paths out of a tree does not clobber unrelated paths' '
|
|
git checkout next &&
|
|
git reset --hard &&
|
|
rm dir/next0 &&
|
|
cat dir/common >expect.common &&
|
|
echo modified >expect.next1 &&
|
|
cat expect.next1 >dir/next1 &&
|
|
echo untracked >expect.next2 &&
|
|
cat expect.next2 >dir/next2 &&
|
|
|
|
git checkout main dir &&
|
|
|
|
test_cmp expect.common dir/common &&
|
|
test_path_is_file dir/main &&
|
|
git diff --exit-code main dir/main &&
|
|
|
|
test_path_is_missing dir/next0 &&
|
|
test_cmp expect.next1 dir/next1 &&
|
|
test_path_is_file dir/next2 &&
|
|
test_must_fail git ls-files --error-unmatch dir/next2 &&
|
|
test_cmp expect.next2 dir/next2
|
|
'
|
|
|
|
test_expect_success 'do not touch unmerged entries matching $path but not in $tree' '
|
|
git checkout next &&
|
|
git reset --hard &&
|
|
|
|
cat dir/common >expect.common &&
|
|
EMPTY_SHA1=$(git hash-object -w --stdin </dev/null) &&
|
|
git rm dir/next0 &&
|
|
cat >expect.next0 <<-EOF &&
|
|
100644 $EMPTY_SHA1 1 dir/next0
|
|
100644 $EMPTY_SHA1 2 dir/next0
|
|
EOF
|
|
git update-index --index-info <expect.next0 &&
|
|
|
|
git checkout main dir &&
|
|
|
|
test_cmp expect.common dir/common &&
|
|
test_path_is_file dir/main &&
|
|
git diff --exit-code main dir/main &&
|
|
git ls-files -s dir/next0 >actual.next0 &&
|
|
test_cmp expect.next0 actual.next0
|
|
'
|
|
|
|
test_expect_success 'do not touch files that are already up-to-date' '
|
|
git reset --hard &&
|
|
echo one >file1 &&
|
|
echo two >file2 &&
|
|
git add file1 file2 &&
|
|
git commit -m base &&
|
|
echo modified >file1 &&
|
|
test-tool chmtime =1000000000 file2 &&
|
|
git update-index -q --refresh &&
|
|
git checkout HEAD -- file1 file2 &&
|
|
echo one >expect &&
|
|
test_cmp expect file1 &&
|
|
echo "1000000000" >expect &&
|
|
test-tool chmtime --get file2 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'checkout HEAD adds deleted intent-to-add file back to index' '
|
|
echo "nonempty" >nonempty &&
|
|
>empty &&
|
|
git add nonempty empty &&
|
|
git commit -m "create files to be deleted" &&
|
|
git rm --cached nonempty empty &&
|
|
git add -N nonempty empty &&
|
|
git checkout HEAD nonempty empty &&
|
|
git diff --cached --exit-code
|
|
'
|
|
|
|
test_done
|