X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=attr.c;h=0e28ba871f9ba0da129610019cd0d0246f3a15f0;hb=e3fa2465518b9a7c4d714edcf9b28bb4138cbaa6;hp=6aff6951d38d7f672aeb9851eca88c6e5a26b950;hpb=a6fd3d4925ca3629e7edc73a60f5e1c50c1d5390;p=thirdparty%2Fgit.git

diff --git a/attr.c b/attr.c
index 6aff6951d3..0e28ba871f 100644
--- 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;