Sync with 2.4.2

diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh
index e1b2a99f105f8700e72974428c126ea049247194..33c1a587b3b9f28ecc824a17650467bdc6011bc6 100755 (executable)
--- a/t/t1510-repo-setup.sh
+++ b/t/t1510-repo-setup.sh
@@ -106,6 +106,7 @@ setup_env () {
 expect () {
        cat >"$1/expected" <<-EOF
        setup: git_dir: $2
+       setup: git_common_dir: $2
        setup: worktree: $3
        setup: cwd: $4
        setup: prefix: $5