From: Junio C Hamano Date: Fri, 14 Feb 2020 20:54:24 +0000 (-0800) Subject: Merge branch 'jk/index-pack-dupfix' X-Git-Tag: v2.26.0-rc0~50 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b029ebaefd945b2315281fcdf9c35843641623b;p=thirdparty%2Fgit.git 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() --- 7b029ebaefd945b2315281fcdf9c35843641623b