Merge branch 'jc/combined'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 2488e6eae1f515baa3adcaceca75000d15976612..07cb706fa8a241bf707b91d033ea0c5c876d9307 100755 (executable)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -207,7 +207,8 @@ test_done () {
 # t/ subdirectory and are run in trash subdirectory.
 PATH=$(pwd)/..:$PATH
 GIT_EXEC_PATH=$(pwd)/..
-export PATH GIT_EXEC_PATH
+HOME=$(pwd)/trash
+export PATH GIT_EXEC_PATH HOME
 
 # Similarly use ../compat/subprocess.py if our python does not
 # have subprocess.py on its own.