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: https://git.lorimer.id.au/gitweb.git/diff_plain/880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf?ds=inline;hp=-c

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
diff --combined t/test-lib.sh
index 11201e9cf8,9f36091bf8..2e5afd696a
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -162,6 -162,9 +162,9 @@@ _x40="$_x05$_x05$_x05$_x05$_x05$_x05$_x
  # Zero SHA-1
  _z40=0000000000000000000000000000000000000000
  
+ EMPTY_TREE=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+ EMPTY_BLOB=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ 
  # Line feed
  LF='
  '
@@@ -170,7 -173,7 +173,7 @@@
  # when case-folding filenames
  u200c=$(printf '\342\200\214')
  
- export _x05 _x40 _z40 LF u200c
+ export _x05 _x40 _z40 LF u200c EMPTY_TREE EMPTY_BLOB
  
  # Each test should start with something like this, after copyright notices:
  #
@@@ -1111,12 -1114,3 +1114,12 @@@ run_with_limited_cmdline () 
  }
  
  test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true'
 +
 +build_option () {
 +	git version --build-options |
 +	sed -ne "s/^$1: //p"
 +}
 +
 +test_lazy_prereq LONG_IS_64BIT '
 +	test 8 -le "$(build_option sizeof-long)"
 +'