summaryrefslogtreecommitdiff
path: root/trace2
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-03-17 15:02:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-17 15:02:22 -0700
commit7e84f4608f9c1f2217e7601010c2451f31dc4e92 (patch)
treedafc6aa1ffe3eaa91e1ef883ede98bd778258a64 /trace2
parentMerge branch 'js/rebase-i-with-colliding-hash' into maint (diff)
parentindex-pack: downgrade twice-resolved REF_DELTA to die() (diff)
downloadtgif-7e84f4608f9c1f2217e7601010c2451f31dc4e92.tar.xz
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()
Diffstat (limited to 'trace2')
0 files changed, 0 insertions, 0 deletions