From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Aug 2018 22:30:39 +0000 (-0700)
Subject: Merge branch 'jk/fsck-gitmodules-gently'
X-Git-Tag: v2.19.0-rc0~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd1a32d5c8ec5987824acb63694361d082ce9092;p=git

Merge branch 'jk/fsck-gitmodules-gently'

Recent "security fix" to pay attention to contents of ".gitmodules"
while accepting "git push" was a bit overly strict than necessary,
which has been adjusted.

* jk/fsck-gitmodules-gently:
  fsck: downgrade gitmodulesParse default to "info"
  fsck: split ".gitmodules too large" error from parse failure
  fsck: silence stderr when parsing .gitmodules
  config: add options parameter to git_config_from_mem
  config: add CONFIG_ERROR_SILENT handler
  config: turn die_on_error into caller-facing enum
---

bd1a32d5c8ec5987824acb63694361d082ce9092