Merge branch 'tg/fix-check-order-with-split-index' into maint
commit07e3f27f48372664f935d250139f52a7a1364e9e
authorJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2015 16:33:07 +0000 (28 09:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2015 16:33:07 +0000 (28 09:33 -0700)
tree5240859dcac47d2803560401b5e9d526dc1127f0
parent9f389aa4920f147a6314719741b47074b2e4b727
parent03f15a79a9006d819a25fe04199f9302ad4aaea0
Merge branch 'tg/fix-check-order-with-split-index' into maint

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
read-cache.c