From: Brandon Williams <bmwill@google.com>
Date: Thu, 3 Aug 2017 18:19:52 +0000 (-0700)
Subject: submodule: don't rely on overlayed config when setting diffopts
X-Git-Tag: v2.15.0-rc0~120^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fdfa9e97dbffdc6868a1a046456c0ad67dda9e29

submodule: don't rely on overlayed config when setting diffopts

Don't rely on overlaying the repository's config on top of the
submodule-config, instead query the repository's config directory for
the ignore field.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/submodule.c b/submodule.c
index 59e3d0828f..a32043893b 100644
--- a/submodule.c
+++ b/submodule.c
@@ -165,8 +165,16 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
 {
 	const struct submodule *submodule = submodule_from_path(&null_oid, path);
 	if (submodule) {
-		if (submodule->ignore)
-			handle_ignore_submodules_arg(diffopt, submodule->ignore);
+		const char *ignore;
+		char *key;
+
+		key = xstrfmt("submodule.%s.ignore", submodule->name);
+		if (repo_config_get_string_const(the_repository, key, &ignore))
+			ignore = submodule->ignore;
+		free(key);
+
+		if (ignore)
+			handle_ignore_submodules_arg(diffopt, ignore);
 		else if (is_gitmodules_unmerged(&the_index))
 			DIFF_OPT_SET(diffopt, IGNORE_SUBMODULES);
 	}