Re: [PATCH v5 0/5] allow more sources for config values

From

Junio C Hamano <gitster@pobox.com>

Date

Jul 11, 2013, 23:26 UTC

Message-ID

<7vk3kwptkl.fsf@alter.siamese.dyndns.org>

In-Reply-To

<20130711223614.GA26477@book-mint>

Thanks.

Thanks, will queue.

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 9ae2508..f0e179e 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -118,6 +118,13 @@ See also <<FILES>>.
 --file config-file::
 	Use the given config file instead of the one specified by GIT_CONFIG.
 
+--blob blob::
+	Similar to '--file' but use the given blob instead of a file. E.g.
+	you can use 'master:.gitmodules' to read values from the file
+	'.gitmodules' in the master branch. See "SPECIFYING REVISIONS"
+	section in linkgit:gitrevisions[7] for a more complete list of
+	ways to spell blob names.
+
 --remove-section::
 	Remove the given section from the configuration file.
 
diff --git a/config.c b/config.c
index a8d3dcf..680dd6d 100644
--- a/config.c
+++ b/config.c
@@ -948,7 +948,7 @@ int git_default_config(const char *var, const char *value, void *dummy)
  * fgetc, ungetc, ftell of top need to be initialized before calling
  * this function.
  */
-static int do_config_from_source(struct config_source *top, config_fn_t fn, void *data)
+static int do_config_from(struct config_source *top, config_fn_t fn, void *data)
 {
 	int ret;
 
@@ -986,7 +986,7 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data)
 		top.ungetc = config_file_ungetc;
 		top.ftell = config_file_ftell;
 
-		ret = do_config_from_source(&top, fn, data);
+		ret = do_config_from(&top, fn, data);
 
 		fclose(f);
 	}
@@ -1007,7 +1007,7 @@ int git_config_from_buf(config_fn_t fn, const char *name, const char *buf,
 	top.ungetc = config_buf_ungetc;
 	top.ftell = config_buf_ftell;
 
-	return do_config_from_source(&top, fn, data);
+	return do_config_from(&top, fn, data);
 }
 
 static int git_config_from_blob_sha1(config_fn_t fn,