Merge branch 'cd-gitdir-subshell'

Author: dscho

t/t4203-mailmap.sh

@@ -943,7 +943,7 @@ test_expect_success 'set up mailmap location tests' '
 '
 
 test_expect_success 'bare repo with --work-tree finds mailmap at top-level' '
-	git -C loc-bare --work-tree=. log -1 --format=%aE >actual &&
+	git -C loc-bare --git-dir=. --work-tree=. log -1 --format=%aE >actual &&
 	echo new@example.com >expect &&
 	test_cmp expect actual
 '

t/t5615-alternate-env.sh

@@ -48,9 +48,12 @@ test_expect_success 'access multiple alternates' '
 # bare paths are relative from $GIT_DIR
 test_expect_success 'access alternate via relative path (bare)' '
 	git init --bare bare.git &&
-	check_obj "../one.git/objects" -C bare.git <<-EOF
-	$one blob
-	EOF
+	(
+		cd bare.git && GIT_DIR=. && export GIT_DIR &&
+		check_obj "../one.git/objects" <<-EOF
+		$one blob
+		EOF
+	)
 '
 
 # non-bare paths are relative to top of worktree