mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test 'git add' for unmerged entries when core.symlinks=false.

Browse Source 
In 2031427167 git add was fixed if unmerged
entries are in the index and core.filemode=false. core.symlinks=false is
a similar case, which touches the same code path. Here is a test that
makes sure that the symlink property in the index is preserved, too.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt
2007-07-02 13:28:42 +02:00
committed by Junio C Hamano
parent 098e711e6c
commit 05dcd69891
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
t/t3700-add.sh
View File

@ -110,30 +110,37 @@ test_expect_success 'check correct prefix detection' '
git add 1/2/a 1/3/b 1/2/c git add 1/2/a 1/3/b 1/2/c
' '
test_expect_success 'git add and filemode=0 with unmerged entries' ' test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' '
echo 1 > stage1 &&
echo 2 > stage2 &&
echo 3 > stage3 &&
for s in 1 2 3 for s in 1 2 3
do do
echo $s > stage$s
echo "100755 $(git hash-object -w stage$s) $s file" echo "100755 $(git hash-object -w stage$s) $s file"
echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s symlink"
done | git update-index --index-info && done | git update-index --index-info &&
git config core.filemode 0 && git config core.filemode 0 &&
git config core.symlinks 0 &&
echo new > file && echo new > file &&
git add file && echo new > symlink &&
git ls-files --stage | grep "^100755 .* 0 file$" git add file symlink &&
git ls-files --stage | grep "^100755 .* 0 file$" &&
git ls-files --stage | grep "^120000 .* 0 symlink$"
' '
test_expect_success 'git add and filemode=0 prefers stage 2 over stage 1' ' test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1' '
git rm --cached -f file && git rm --cached -f file symlink &&
( (
echo "100644 $(git hash-object -w stage1) 1 file" echo "100644 $(git hash-object -w stage1) 1 file"
echo "100755 $(git hash-object -w stage2) 2 file" echo "100755 $(git hash-object -w stage2) 2 file"
echo "100644 $(printf $s | git hash-object -w -t blob --stdin) 1 symlink"
echo "120000 $(printf $s | git hash-object -w -t blob --stdin) 2 symlink"
) | git update-index --index-info && ) | git update-index --index-info &&
git config core.filemode 0 && git config core.filemode 0 &&
git config core.symlinks 0 &&
echo new > file && echo new > file &&
git add file && echo new > symlink &&
git ls-files --stage | grep "^100755 .* 0 file$" git add file symlink &&
git ls-files --stage | grep "^100755 .* 0 file$" &&
git ls-files --stage | grep "^120000 .* 0 symlink$"
' '
test_done test_done