From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Feb 2016 21:37:17 +0000 (-0800)
Subject: Merge branch 'ls/config-origin'
X-Git-Tag: v2.8.0-rc0~18
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dd0f567f1041a3caea7856b3efe20f8fb9b487b5?hp=--cc

Merge branch 'ls/config-origin'

The configuration system has been taught to phrase where it found a
bad configuration variable in a better way in its error messages.
"git config" learnt a new "--show-origin" option to indicate where
the values come from.

* ls/config-origin:
config: add '--show-origin' option to print the origin of a config value
config: add 'origin_type' to config_source struct
rename git_config_from_buf to git_config_from_mem
t: do not hide Git's exit code in tests using 'nul_to_q'
---

dd0f567f1041a3caea7856b3efe20f8fb9b487b5