git_dir changes are acceptable. The other two, hm... --- t/t1510-repo-setup.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh index 9d24a0f..7dbccf4 100755 --- a/t/t1510-repo-setup.sh +++ b/t/t1510-repo-setup.sh @@ -781,7 +781,7 @@ EOF test_expect_success '#6: GIT_DIR(rel), core.worktree=../.. at root' ' cat >6/expected <<EOF && -setup: git_dir: .git +setup: git_dir: $TRASH_DIRECTORY/6/.git setup: worktree: $TRASH_DIRECTORY setup: cwd: $TRASH_DIRECTORY setup: prefix: 6/ @@ -792,7 +792,7 @@ EOF test_expect_success '#6: GIT_DIR(rel), core.worktree=../..(rel) at root' ' cat >6/expected <<EOF && -setup: git_dir: .git +setup: git_dir: $TRASH_DIRECTORY/6/.git setup: worktree: $TRASH_DIRECTORY setup: cwd: $TRASH_DIRECTORY setup: prefix: 6/ @@ -3713,7 +3713,7 @@ EOF test_repo 24 ' -test_expect_success '#24: in subdir' ' +test_expect_failure '#24: in subdir' ' cat >24/sub/expected <<EOF && setup: git_dir: $TRASH_DIRECTORY/24.git setup: worktree: (null) @@ -4147,7 +4147,7 @@ EOF test_repo 28 ' -test_expect_success '#28: in subdir' ' +test_expect_failure '#28: in subdir' ' cat >28/sub/expected <<EOF && setup: git_dir: $TRASH_DIRECTORY/28.git setup: worktree: (null) -- 1.7.0.2.445.gcbdb3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html