gitattributes: drop support for GIT_ATTR_NOGLOBAL

jrn · gitster · commit e91b6c504961 · 2011-03-15T12:23:29.000-07:00
test-lib sets $HOME to protect against pollution from user settings,
so setting GIT_ATTR_NOGLOBAL would be redundant.  Simplify by
eliminating support for that environment variable altogether.

GIT_ATTR_NOGLOBAL was introduced in v1.7.4-rc0~208^2 (Add global and
system-wide gitattributes, 2010-09-01) as an undocumented feature for
use by the test suite.  It never ended up being used (neither within
git.git nor in other projects).

This patch does not affect GIT_ATTR_NOSYSTEM, which should still be
useful.

Helped-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/attr.c b/attr.c
@@ -478,11 +478,6 @@ int git_attr_system(void)
 	return !git_env_bool("GIT_ATTR_NOSYSTEM", 0);
 }
 
-int git_attr_global(void)
-{
-	return !git_env_bool("GIT_ATTR_NOGLOBAL", 0);
-}
-
 static int git_attr_config(const char *var, const char *value, void *dummy)
 {
 	if (!strcmp(var, "core.attributesfile"))
@@ -511,7 +506,7 @@ static void bootstrap_attr_stack(void)
 		}
 
 		git_config(git_attr_config, NULL);
-		if (git_attr_global() && attributes_file) {
+		if (attributes_file) {
 			elem = read_attr_from_file(attributes_file, 1);
 			if (elem) {
 				elem->origin = NULL;

Original file line number	Diff line number	Diff line change
`@@ -478,11 +478,6 @@ int git_attr_system(void)`
`478`	`478`	`return !git_env_bool("GIT_ATTR_NOSYSTEM", 0);`
`479`	`479`	`}`
`480`	`480`
`481`		`-int git_attr_global(void)`
`482`		`-{`
`483`		`- return !git_env_bool("GIT_ATTR_NOGLOBAL", 0);`
`484`		`-}`
`485`		`-`
`486`	`481`	`static int git_attr_config(const char var, const char value, void *dummy)`
`487`	`482`	`{`
`488`	`483`	`if (!strcmp(var, "core.attributesfile"))`
`@@ -511,7 +506,7 @@ static void bootstrap_attr_stack(void)`
`511`	`506`	`}`
`512`	`507`
`513`	`508`	`git_config(git_attr_config, NULL);`
`514`		`- if (git_attr_global() && attributes_file) {`
	`509`	`+ if (attributes_file) {`
`515`	`510`	`elem = read_attr_from_file(attributes_file, 1);`
`516`	`511`	`if (elem) {`
`517`	`512`	`elem->origin = NULL;`