Skip to content

Commit

Permalink
t9100: remove bogus " || test" after each test scriptlet
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Feb 22, 2012
1 parent 675fff4 commit 2ab5ca8
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions t/t9100-git-svn-basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ test_expect_success "$name" "
git update-index --add dir/file/file &&
git commit -m '$name' &&
test_must_fail git svn set-tree --find-copies-harder --rmdir \
${remotes_git_svn}..mybranch" || true
${remotes_git_svn}..mybranch
"


name='detect node change from directory to file #1'
Expand All @@ -79,7 +80,8 @@ test_expect_success "$name" '
git update-index --add -- bar &&
git commit -m "$name" &&
test_must_fail git svn set-tree --find-copies-harder --rmdir \
${remotes_git_svn}..mybranch2' || true
${remotes_git_svn}..mybranch2
'


name='detect node change from file to directory #2'
Expand All @@ -96,7 +98,8 @@ test_expect_success "$name" '
${remotes_git_svn}..mybranch3 &&
svn_cmd up "$SVN_TREE" &&
test -d "$SVN_TREE"/bar/zzz &&
test -e "$SVN_TREE"/bar/zzz/yyy ' || true
test -e "$SVN_TREE"/bar/zzz/yyy
'

name='detect node change from directory to file #2'
test_expect_success "$name" '
Expand All @@ -109,7 +112,8 @@ test_expect_success "$name" '
git update-index --add -- dir &&
git commit -m "$name" &&
test_must_fail git svn set-tree --find-copies-harder --rmdir \
${remotes_git_svn}..mybranch4' || true
${remotes_git_svn}..mybranch4
'


name='remove executable bit from a file'
Expand Down Expand Up @@ -162,7 +166,7 @@ test_expect_success "$name" '

name='modify a symlink to become a file'
test_expect_success "$name" '
echo git help > help || true &&
echo git help >help &&
rm exec-2.sh &&
cp help exec-2.sh &&
git update-index exec-2.sh &&
Expand Down

0 comments on commit 2ab5ca8

Please sign in to comment.