[PATCH 5/6] t1510 (worktree): fix '&&' chaining
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Dec 9, 2011, 11:29 UTC
- Message-ID
- <1323430158-14885-6-git-send-email-artagnon@gmail.com>
- In-Reply-To
- <1323430158-14885-1-git-send-email-artagnon@gmail.com>
Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain. Fix these breaks.
'unset' returns non-zero status when the variable passed was already unset on some shells; now that its status is tested, change these instances to 'sane_unset'.
Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> --- 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 6384983..e661147 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 '
-- 1.7.7.3