From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jul 2013 18:24:09 +0000 (-0700)
Subject: Merge branch 'hv/config-from-blob'
X-Git-Url: https://repo.or.cz/w/git/mingw.git/commitdiff_plain/c714f9fd8addc752aaaf1f97bb2be311d9156def

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
---

c714f9fd8addc752aaaf1f97bb2be311d9156def
diff --cc builtin/config.c
index 7759671eb8,8d01b7ab46..4010c4320a
--- a/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"))