Merge branch 'jn/test-sanitize-git-env'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Mar 2011 04:38:12 +0000 (21:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Mar 2011 04:38:12 +0000 (21:38 -0700)
* jn/test-sanitize-git-env:
  tests: scrub environment of GIT_* variables
  config: drop support for GIT_CONFIG_NOGLOBAL
  gitattributes: drop support for GIT_ATTR_NOGLOBAL
  tests: suppress system gitattributes
  tests: stop worrying about obsolete environment variables

1  2 
cache.h
config.c
t/test-lib.sh

diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
diff --cc t/test-lib.sh
Simple merge