From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2016 21:21:32 +0000 (-0700)
Subject: Merge branch 'nd/cache-tree-ita' into maint
X-Git-Tag: v2.9.3~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf;p=thirdparty%2Fgit.git

Merge branch 'nd/cache-tree-ita' into maint

"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
---

880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf