cache-tree: invalidate i-t-a paths after generating trees
Intent-to-add entries used to forbid writing trees so it was not a
problem. After commit 3f6d56d (commit: ignore intent-to-add entries
instead of refusing - 2012-02-07), we can generate trees from an index
with i-t-a entries.
However, the commit forgets to invalidate all paths leading to i-t-a
entries. With fully valid cache-tree (e.g. after commit or
write-tree), diff operations may prefer cache-tree to index and not
see i-t-a entries in the index, because cache-tree does not have them.
Reported-by: Jonathon Mah <me@JonathonMah.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
3cf773e426
commit
eec3e7e406
@@ -62,5 +62,25 @@ test_expect_success 'can "commit -a" with an i-t-a entry' '
|
||||
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_done
|
||||
|
||||
|
||||
Reference in New Issue
Block a user