diff: load funcname patterns in "basic" config

peff · gitster · commit e467193ff3f5 · 2008-01-04T16:22:01.000-08:00
The funcname patterns influence the "comment" on @@ lines of
the diff. They are safe to use with plumbing since they
don't fundamentally change the meaning of the diff in any
way.

Since all diff users call either diff_ui_config or
diff_basic_config, we can get rid of the lazy reading of the
config.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/diff.c b/diff.c
@@ -174,8 +174,6 @@ int git_diff_ui_config(const char *var, const char *value)
 		if (ep != var + 4) {
 			if (!strcmp(ep, ".command"))
 				return parse_lldiff_command(var, ep, value);
-			if (!strcmp(ep, ".funcname"))
-				return parse_funcname_pattern(var, ep, value);
 		}
 	}
 
@@ -190,6 +188,14 @@ int git_diff_basic_config(const char *var, const char *value)
 		return 0;
 	}
 
+	if (!prefixcmp(var, "diff.")) {
+		const char *ep = strrchr(var, '.');
+		if (ep != var + 4) {
+			if (!strcmp(ep, ".funcname"))
+				return parse_funcname_pattern(var, ep, value);
+		}
+	}
+
 	return git_default_config(var, value);
 }
 
@@ -1160,7 +1166,6 @@ static const char *funcname_pattern(const char *ident)
 {
 	struct funcname_pattern *pp;
 
-	read_config_if_needed();
 	for (pp = funcname_pattern_list; pp; pp = pp->next)
 		if (!strcmp(ident, pp->name))
 			return pp->pattern;

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,6 @@ int git_diff_ui_config(const char var, const char value)`
`174`	`174`	`if (ep != var + 4) {`
`175`	`175`	`if (!strcmp(ep, ".command"))`
`176`	`176`	`return parse_lldiff_command(var, ep, value);`
`177`		`- if (!strcmp(ep, ".funcname"))`
`178`		`- return parse_funcname_pattern(var, ep, value);`
`179`	`177`	`}`
`180`	`178`	`}`
`181`	`179`
`@@ -190,6 +188,14 @@ int git_diff_basic_config(const char var, const char value)`
`190`	`188`	`return 0;`
`191`	`189`	`}`
`192`	`190`
	`191`	`+ if (!prefixcmp(var, "diff.")) {`
	`192`	`+ const char *ep = strrchr(var, '.');`
	`193`	`+ if (ep != var + 4) {`
	`194`	`+ if (!strcmp(ep, ".funcname"))`
	`195`	`+ return parse_funcname_pattern(var, ep, value);`
	`196`	`+ }`
	`197`	`+ }`
	`198`	`+`
`193`	`199`	`return git_default_config(var, value);`
`194`	`200`	`}`
`195`	`201`
`@@ -1160,7 +1166,6 @@ static const char funcname_pattern(const char ident)`
`1160`	`1166`	`{`
`1161`	`1167`	`struct funcname_pattern *pp;`
`1162`	`1168`
`1163`		`- read_config_if_needed();`
`1164`	`1169`	`for (pp = funcname_pattern_list; pp; pp = pp->next)`
`1165`	`1170`	`if (!strcmp(ident, pp->name))`
`1166`	`1171`	`return pp->pattern;`