diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-19 16:05:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-19 16:05:25 -0800 |
| commit | 9293aac2b1911abd52d08fc1e8641dc69ab8a8ad (patch) | |
| tree | 12416b05b926ed7642cabc7164cedb948d61ec52 /t/t1501-worktree.sh | |
| parent | 33e7fefef6b68b300870e04904ad1db48be9b580 (diff) | |
| parent | 13c907c4fe9b0d96a68c04f7d64f66873e0db8b7 (diff) | |
| download | git-9293aac2b1911abd52d08fc1e8641dc69ab8a8ad.tar.gz | |
Merge branch 'rr/test-chaining'
* rr/test-chaining:
t3401: use test_commit in setup
t3401: modernize style
t3040 (subprojects-basic): fix '&&' chaining, modernize style
t1510 (worktree): fix '&&' chaining
t3030 (merge-recursive): use test_expect_code
test: fix '&&' chaining
t3200 (branch): fix '&&' chaining
Diffstat (limited to 't/t1501-worktree.sh')
| -rwxr-xr-x | t/t1501-worktree.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh index 63849836c8..e661147c57 100755 --- a/t/t1501-worktree.sh +++ b/t/t1501-worktree.sh @@ -48,7 +48,7 @@ test_expect_success 'setup: helper for testing rev-parse' ' ' test_expect_success 'setup: core.worktree = relative path' ' - unset GIT_WORK_TREE; + sane_unset GIT_WORK_TREE && GIT_DIR=repo.git && GIT_CONFIG="$(pwd)"/$GIT_DIR/config && export GIT_DIR GIT_CONFIG && @@ -89,7 +89,7 @@ test_expect_success 'subdir of work tree' ' ' test_expect_success 'setup: core.worktree = absolute path' ' - unset GIT_WORK_TREE; + sane_unset GIT_WORK_TREE && GIT_DIR=$(pwd)/repo.git && GIT_CONFIG=$GIT_DIR/config && export GIT_DIR GIT_CONFIG && @@ -334,7 +334,7 @@ test_expect_success 'absolute pathspec should fail gracefully' ' ' test_expect_success 'make_relative_path handles double slashes in GIT_DIR' ' - >dummy_file + >dummy_file && echo git --git-dir="$(pwd)//repo.git" --work-tree="$(pwd)" add dummy_file && git --git-dir="$(pwd)//repo.git" --work-tree="$(pwd)" add dummy_file ' |