git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
	Petr Onderka <gsvick@gmail.com>
Subject: [PATCH 2/3] tests: suppress global and system gitattributes
Date: Tue, 15 Mar 2011 01:56:43 -0500	[thread overview]
Message-ID: <20110315065643.GB29530@elie> (raw)
In-Reply-To: <20110315064909.GA25738@elie>

Set GIT_ATTR_NOGLOBAL and GIT_ATTR_NOSYSTEM in test-lib to make
tests more reliable in two ways:

 - an invalid GIT_ATTR_NOGLOBAL or GIT_ATTR_NOSYSTEM setting
   should not cause tests to fail with

	fatal: bad config value for 'GIT_ATTR_NOGLOBAL'

 - /etc/gitattributes should not change the outcome of tests.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 t/test-lib.sh |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0fdc541..8ae03c7 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -955,7 +955,10 @@ GIT_TEMPLATE_DIR="$GIT_BUILD_DIR"/templates/blt
 unset GIT_CONFIG
 GIT_CONFIG_NOSYSTEM=1
 GIT_CONFIG_NOGLOBAL=1
-export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL
+GIT_ATTR_NOSYSTEM=1
+GIT_ATTR_NOGLOBAL=1
+export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR
+export GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL GIT_ATTR_NOSYSTEM GIT_ATTR_NOGLOBAL
 
 . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
 
-- 
1.7.4.1

  parent reply	other threads:[~2011-03-15  6:56 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-15  6:49 [PATCH 0/3] tests: unsetting variables that influence the outcome Jonathan Nieder
2011-03-15  6:56 ` [PATCH 1/3] tests: protect against GIT_ATTR_NOGLOBAL from environment Jonathan Nieder
2011-03-15  6:56 ` Jonathan Nieder [this message]
2011-03-15  7:16   ` [PATCH 2/3] tests: suppress global and system gitattributes Jeff King
2011-03-15  9:02     ` [PATCH 1-2/3 v2 0/3] " Jonathan Nieder
2011-03-15  9:04       ` [PATCH 1/3] gitattributes: drop support for GIT_ATTR_NOGLOBAL Jonathan Nieder
2011-03-15  9:04       ` [PATCH 2/3] config: drop support for GIT_CONFIG_NOGLOBAL Jonathan Nieder
2011-03-15  9:05       ` [PATCH 3/3] tests: suppress system gitattributes Jonathan Nieder
2011-03-15  7:04 ` [PATCH 3/3] tests: scrub environment of GIT_* variables Jonathan Nieder
2011-03-15  7:37   ` Jeff King
2011-03-15 10:08     ` [RFC/PATCH 0/2] tests: stop hard-coding the list of GIT_* vars to scrub Jonathan Nieder
2011-03-15 10:09       ` [PATCH 1/2] tests: stop worrying about obsolete environment variables Jonathan Nieder
2011-03-15 10:10       ` [RFC/PATCH 2/2] tests: scrub environment of GIT_* variables Jonathan Nieder
2011-03-15 17:20         ` Junio C Hamano
2011-03-15 20:01           ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110315065643.GB29530@elie \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=gsvick@gmail.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).