Merge branch 'jk/index-pack-dupfix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:21 +0000 (15:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:22 +0000 (15:02 -0700)
commit7e84f4608f9c1f2217e7601010c2451f31dc4e92
treedafc6aa1ffe3eaa91e1ef883ede98bd778258a64
parentfa24bbe8645281b66213b47909864495fc5f7536
parenta21781011f80c9fcb31e84c7a164611491d8c663
Merge branch 'jk/index-pack-dupfix' into maint

The index-pack code now diagnoses a bad input packstream that
records the same object twice when it is used as delta base; the
code used to declare a software bug when encountering such an
input, but it is an input error.

* jk/index-pack-dupfix:
  index-pack: downgrade twice-resolved REF_DELTA to die()