Merge branch 'hv/config-from-blob'

Allow configuration data to be read from in-tree blob objects,
which would help working in a bare repository and submodule
updates.

* hv/config-from-blob:
  do not die when error in config parsing of buf occurs
  teach config --blob option to parse config from database
  config: make parsing stack struct independent from actual data source
  config: drop cf validity check in get_next_char()
  config: factor out config file stack management

diff --cc Documentation/git-config.txt
Simple merge

diff --cc builtin/config.c
index 7759671eb8d44ad341831eeffc96c4469d0652e8,8d01b7ab461b6db3a2e28499f9846739a133ed3b..4010c4320a585d84bdb0914d8a9bbc27d38b7f18
--- 1/builtin/config.c
--- 2/builtin/config.c
+++ b/builtin/config.c
@@@ -329,9 -333,9 +333,10 @@@ static int get_colorbool(int print
  {
        get_colorbool_found = -1;
        get_diff_color_found = -1;
 +      get_color_ui_found = -1;
        git_config_with_options(git_get_colorbool_config, NULL,
-                               given_config_file, respect_includes);
+                               given_config_file, given_config_blob,
+                               respect_includes);
  
        if (get_colorbool_found < 0) {
                if (!strcmp(get_colorbool_slot, "color.diff"))

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge