[PATCH v3 4/4] cache-tree: do not generate empty trees as a result of all i-t-a subentries
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Jul 9, 2016, 05:23 UTC
- Message-ID
- <20160709052356.30570-5-pclouds@gmail.com>
- In-Reply-To
- <20160709052356.30570-1-pclouds@gmail.com>
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> --- cache-tree.c | 7 +++++++ t/t2203-add-intent.sh | 14 ++++++++++++++ 2 files changed, 21 insertions(+)
diff --git a/cache-tree.c b/cache-tree.c index c2676e8..2d50640 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -380,6 +380,13 @@ static int update_one(struct cache_tree *it, continue; } + /* + * "sub" can be an empty tree if subentries are i-t-a. + */ + if (sub && sub->cache_tree->entry_count < 0 && + !hashcmp(sha1, EMPTY_TREE_SHA1_BIN)) + continue; + strbuf_grow(&buffer, entlen + 100); strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0'); strbuf_add(&buffer, sha1, 20); diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index 24aed2e..f4b2fac 100755 --- a/t/t2203-add-intent.sh +++ b/t/t2203-add-intent.sh @@ -99,5 +99,19 @@ test_expect_success 'cache-tree does not ignore dir that has i-t-a entries' ' ) ' +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
-- 2.8.2.537.g0965dd9