Merge branch 'hv/config-from-blob'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:24:09 +0000 (22 11:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:24:09 +0000 (22 11:24 -0700)
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

1  2 
Documentation/git-config.txt
builtin/config.c
cache.h
config.c

Simple merge
@@@ -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