From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Mar 2011 21:09:15 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc0~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/537d99033749591245ddd36f7317fd6b8555d803?ds=inline;hp=-c

Merge branch 'maint'

* maint:
HOME must be set before calling git-init when creating test repositories
---

537d99033749591245ddd36f7317fd6b8555d803
diff --combined t/test-lib.sh
index 7a56f11101,c91e232437..abc47f3abc
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -43,25 -43,36 +43,25 @@@ TERM=dum
  export LANG LC_ALL PAGER TERM TZ
  EDITOR=:
  unset VISUAL
 -unset GIT_EDITOR
 -unset AUTHOR_DATE
 -unset AUTHOR_EMAIL
 -unset AUTHOR_NAME
 -unset COMMIT_AUTHOR_EMAIL
 -unset COMMIT_AUTHOR_NAME
  unset EMAIL
 -unset GIT_ALTERNATE_OBJECT_DIRECTORIES
 -unset GIT_AUTHOR_DATE
 +unset $(perl -e '
 +	my @env = keys %ENV;
 +	my $ok = join("|", qw(
 +		TRACE
 +		DEBUG
 +		USE_LOOKUP
 +		TEST
 +		.*_TEST
 +		PROVE
 +		VALGRIND
 +	));
 +	my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
 +	print join("\n", @vars);
 +')
  GIT_AUTHOR_EMAIL=author@example.com
  GIT_AUTHOR_NAME='A U Thor'
 -unset GIT_COMMITTER_DATE
  GIT_COMMITTER_EMAIL=committer@example.com
  GIT_COMMITTER_NAME='C O Mitter'
 -unset GIT_DIFF_OPTS
 -unset GIT_DIR
 -unset GIT_WORK_TREE
 -unset GIT_EXTERNAL_DIFF
 -unset GIT_INDEX_FILE
 -unset GIT_OBJECT_DIRECTORY
 -unset GIT_CEILING_DIRECTORIES
 -unset SHA1_FILE_DIRECTORIES
 -unset SHA1_FILE_DIRECTORY
 -unset GIT_NOTES_REF
 -unset GIT_NOTES_DISPLAY_REF
 -unset GIT_NOTES_REWRITE_REF
 -unset GIT_NOTES_REWRITE_MODE
 -unset GIT_REFLOG_ACTION
 -unset GIT_CHERRY_PICK_HELP
 -unset GIT_QUIET
  GIT_MERGE_VERBOSITY=5
  export GIT_MERGE_VERBOSITY
  export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
@@@ -943,8 -954,8 +943,8 @@@ f
  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
 +export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_ATTR_NOSYSTEM
  
  . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
  
@@@ -993,14 -1004,14 +993,14 @@@ rm -fr "$test" || 
  	exit 1
  }
  
+ HOME="$TRASH_DIRECTORY"
+ export HOME
+ 
  test_create_repo "$test"
  # Use -P to resolve symlinks in our working directory so that the cwd
  # in subprocesses like git equals our $PWD (for pathname comparisons).
  cd -P "$test" || exit 1
  
- HOME=$(pwd)
- export HOME
- 
  this_test=${0##*/}
  this_test=${this_test%%-*}
  for skp in $GIT_SKIP_TESTS
@@@ -1068,15 -1079,6 +1068,15 @@@ esa
  test -z "$NO_PERL" && test_set_prereq PERL
  test -z "$NO_PYTHON" && test_set_prereq PYTHON
  
 +# Can we rely on git's output in the C locale?
 +if test -n "$GETTEXT_POISON"
 +then
 +	GIT_GETTEXT_POISON=YesPlease
 +	export GIT_GETTEXT_POISON
 +else
 +	test_set_prereq C_LOCALE_OUTPUT
 +fi
 +
  # test whether the filesystem supports symbolic links
  ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS
  rm -f y