Merge branch 'jk/index-pack-dupfix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:54:24 +0000 (12:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:54:24 +0000 (12:54 -0800)
commit7b029ebaefd945b2315281fcdf9c35843641623b
tree4c8ac3dbc5ab714f6481773faa5d553cbf3577d6
parentaa21cc97bd10ab0b62f6d951ff2ff725261e326e
parenta21781011f80c9fcb31e84c7a164611491d8c663
Merge branch 'jk/index-pack-dupfix'

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()
builtin/index-pack.c