]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 327b3f8 6d6a782)
Merge branch 'nd/cache-tree-ita' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:21:32 +0000 (14:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:21:33 +0000 (14:21 -0700)
commit880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf
tree8f8b8c40c0e6914a81d5ac2c3b3658389f06de10tree | snapshot
parent327b3f8459a316aa5c27a8784f0f504122fce60ecommit | diff
parent6d6a782fbf83927212f348f91823d886c5cd6d85commit | diff
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
t/test-lib.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.