Skip to content

Commit

Permalink
t1510 (worktree): fix '&&' chaining
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ramkumar Ramachandra authored and Junio C Hamano committed Dec 9, 2011
1 parent 67b6afe commit 7f9a5fc
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions t/t1501-worktree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down Expand Up @@ -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 &&
Expand Down Expand Up @@ -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
'
Expand Down

0 comments on commit 7f9a5fc

Please sign in to comment.