Merge branch 'jh/partial-clone'
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Mar 2018 22:39:59 +0000 (15:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Mar 2018 22:39:59 +0000 (15:39 -0700)
Hotfix.

* jh/partial-clone:
  upload-pack: disable object filtering when disabled by config
  unpack-trees: release oid_array after use in check_updates()

1  2 
Documentation/config.txt
unpack-trees.c
upload-pack.c

Simple merge
diff --cc unpack-trees.c
Simple merge
diff --cc upload-pack.c
Simple merge