mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
6d6a782fbf
If a subdirectory contains nothing but i-t-a entries, we generate an empty tree object and add it to its parent tree. Which is wrong. Such a subdirectory should not be added. Note that this has a cascading effect. If subdir 'a/b/c' contains nothing but i-t-a entries, we ignore it. But then if 'a/b' contains only (the non-existing) 'a/b/c', then we should ignore 'a/b' while building 'a' too. And it goes all the way up to top directory. Noticed-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
117 lines
2.5 KiB
Bash
Executable file
117 lines
2.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Intent to add'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'intent to add' '
|
|
echo hello >file &&
|
|
echo hello >elif &&
|
|
git add -N file &&
|
|
git add elif
|
|
'
|
|
|
|
test_expect_success 'check result of "add -N"' '
|
|
git ls-files -s file >actual &&
|
|
empty=$(git hash-object --stdin </dev/null) &&
|
|
echo "100644 $empty 0 file" >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'intent to add is just an ordinary empty blob' '
|
|
git add -u &&
|
|
git ls-files -s file >actual &&
|
|
git ls-files -s elif | sed -e "s/elif/file/" >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'intent to add does not clobber existing paths' '
|
|
git add -N file elif &&
|
|
empty=$(git hash-object --stdin </dev/null) &&
|
|
git ls-files -s >actual &&
|
|
! grep "$empty" actual
|
|
'
|
|
|
|
test_expect_success 'i-t-a entry is simply ignored' '
|
|
test_tick &&
|
|
git commit -a -m initial &&
|
|
git reset --hard &&
|
|
|
|
echo xyzzy >rezrov &&
|
|
echo frotz >nitfol &&
|
|
git add rezrov &&
|
|
git add -N nitfol &&
|
|
git commit -m second &&
|
|
test $(git ls-tree HEAD -- nitfol | wc -l) = 0 &&
|
|
test $(git diff --name-only HEAD -- nitfol | wc -l) = 1
|
|
'
|
|
|
|
test_expect_success 'can commit with an unrelated i-t-a entry in index' '
|
|
git reset --hard &&
|
|
echo bozbar >rezrov &&
|
|
echo frotz >nitfol &&
|
|
git add rezrov &&
|
|
git add -N nitfol &&
|
|
git commit -m partial rezrov
|
|
'
|
|
|
|
test_expect_success 'can "commit -a" with an i-t-a entry' '
|
|
git reset --hard &&
|
|
: >nitfol &&
|
|
git add -N nitfol &&
|
|
git commit -a -m all
|
|
'
|
|
|
|
test_expect_success 'cache-tree invalidates i-t-a paths' '
|
|
git reset --hard &&
|
|
mkdir dir &&
|
|
: >dir/foo &&
|
|
git add dir/foo &&
|
|
git commit -m foo &&
|
|
|
|
: >dir/bar &&
|
|
git add -N dir/bar &&
|
|
git diff --cached --name-only >actual &&
|
|
echo dir/bar >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
git write-tree >/dev/null &&
|
|
|
|
git diff --cached --name-only >actual &&
|
|
echo dir/bar >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'cache-tree does not ignore dir that has i-t-a entries' '
|
|
git init ita-in-dir &&
|
|
(
|
|
cd ita-in-dir &&
|
|
mkdir 2 &&
|
|
for f in 1 2/1 2/2 3
|
|
do
|
|
echo "$f" >"$f"
|
|
done &&
|
|
git add 1 2/2 3 &&
|
|
git add -N 2/1 &&
|
|
git commit -m committed &&
|
|
git ls-tree -r HEAD >actual &&
|
|
grep 2/2 actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'cache-tree does skip dir that becomes empty' '
|
|
rm -fr ita-in-dir &&
|
|
git init ita-in-dir &&
|
|
(
|
|
cd ita-in-dir &&
|
|
mkdir -p 1/2/3 &&
|
|
echo 4 >1/2/3/4 &&
|
|
git add -N 1/2/3/4 &&
|
|
git write-tree >actual &&
|
|
echo $EMPTY_TREE >expected &&
|
|
test_cmp expected actual
|
|
)
|
|
'
|
|
|
|
test_done
|
|
|