Merge branch 'maint'

diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
index c039ee3fd86fc30a551a301066528a8574c34c1e..27dc6c55d5f50a7fd30388b60230482bad6be2d8 100755 (executable)
--- a/t/t1501-worktree.sh
+++ b/t/t1501-worktree.sh
@@ -92,6 +92,13 @@ cd sub/dir || exit 1
 test_rev_parse 'in repo.git/sub/dir' false true true sub/dir/
 cd ../../../.. || exit 1
 
+test_expect_success 'detecting gitdir when cwd is in a subdir of gitdir' '
+       (expected=$(pwd)/repo.git &&
+        cd repo.git/refs &&
+        unset GIT_DIR &&
+        test "$expected" = "$(git rev-parse --git-dir)")
+'
+
 test_expect_success 'repo finds its work tree' '
        (cd repo.git &&
         : > work/sub/dir/untracked &&
@@ -171,7 +178,7 @@ test_expect_success 'git diff' '
 
 test_expect_success 'git grep' '
        (cd repo.git/work/sub &&
-       GIT_DIR=../.. GIT_WORK_TREE=.. git grep -l changed | grep -q dir/tracked)
+       GIT_DIR=../.. GIT_WORK_TREE=.. git grep -l changed | grep dir/tracked)
 '
 
 test_done