Merge branch 'jc/rebase-orig-head'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index c0c5e0e83b01c1ede231a59a2a628e374de246da..8e2849b5ce915c3984894628e8e3ce990812ddfd 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -35,6 +35,7 @@ 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
 GIT_MERGE_VERBOSITY=5