From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jul 2016 21:13:44 +0000 (-0700)
Subject: Merge branch 'nd/cache-tree-ita'
X-Git-Tag: v2.10.0-rc0~86
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3cc75c10d781572a073d7dbff4e1695b93a89d48?hp=--cc

Merge branch 'nd/cache-tree-ita'

"git add -N dir/file && git write-tree" produced an incorrect tree
when there are other paths in the same directory that sorts after
"file".

* nd/cache-tree-ita:
cache-tree: do not generate empty trees as a result of all i-t-a subentries
cache-tree.c: fix i-t-a entry skipping directory updates sometimes
test-lib.sh: introduce and use $EMPTY_BLOB
test-lib.sh: introduce and use $EMPTY_TREE
---

3cc75c10d781572a073d7dbff4e1695b93a89d48