Merge branch 'tg/fix-check-order-with-split-index'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2015 19:54:26 +0000 (12:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2015 19:54:26 +0000 (12:54 -0700)
The split-index mode introduced at v2.3.0-rc0~41 was broken in the
codepath to protect us against a broken reimplementation of Git
that writes an invalid index with duplicated index entries, etc.

* tg/fix-check-order-with-split-index:
read-cache: fix reading of split index

1  2 
read-cache.c
diff --cc read-cache.c
Simple merge