]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/fsck-unexpected-type'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Nov 2021 23:29:25 +0000 (15:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Nov 2021 23:29:25 +0000 (15:29 -0800)
Regression fix.

* ab/fsck-unexpected-type:
  object-file: free(*contents) only in read_loose_object() caller
  object-file: fix SEGV on free() regression in v2.34.0-rc2

1  2 
builtin/fsck.c
object-file.c

diff --cc builtin/fsck.c
Simple merge
diff --cc object-file.c
Simple merge