Skip to content

Commit

Permalink
gitattributes: drop support for GIT_ATTR_NOGLOBAL
Browse files Browse the repository at this point in the history
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 <peff@peff.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed Mar 15, 2011
1 parent 3c995be commit e91b6c5
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e91b6c5

Please sign in to comment.