X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fconfig.c;h=f3d1660d023f7893373436617a9f729ce1d60f4d;hb=7e7db5e4520388d3a6f1efbe2f7a29d43bd06a2b;hp=4bc46b15fde00d913577a2980778746f8315bb70;hpb=60335534a6ac52d4d3a372a5b56df5a57a4463d1;p=git.git

diff --git a/builtin/config.c b/builtin/config.c
index 4bc46b15f..f3d1660d0 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -197,7 +197,11 @@ static int get_value(const char *key_, const char *regex_)
 		git_config_from_file(show_config, system_wide, NULL);
 	if (do_all && global)
 		git_config_from_file(show_config, global, NULL);
-	git_config_from_file(show_config, local, NULL);
+	if (do_all)
+		git_config_from_file(show_config, local, NULL);
+	git_config_from_parameters(show_config, NULL);
+	if (!do_all && !seen)
+		git_config_from_file(show_config, local, NULL);
 	if (!do_all && !seen && global)
 		git_config_from_file(show_config, global, NULL);
 	if (!do_all && !seen && system_wide)