diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2011-12-08 18:40:16 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 10:38:13 -0800 |
| commit | 7f9a5fc6876a3158cb29b0c2d13ccb226ec7d679 (patch) | |
| tree | 4f7722de7aa5cf124dd39ffd9d18404df0c9273c | |
| parent | 67b6afe1ed424934679649752c9efb9896bfacf0 (diff) | |
| download | git-7f9a5fc6876a3158cb29b0c2d13ccb226ec7d679.tar.gz git-7f9a5fc6876a3158cb29b0c2d13ccb226ec7d679.tar.xz | |
t1510 (worktree): fix '&&' chaining
Breaks in a test assertion's && chain can potentially hide failures
from earlier commands in the chain.
'unset' returns non-zero status when the variable passed was already unset
on some shells; we need to change these instances to 'sane_unset'.
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 63849836c..e661147c5 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 ' |