@@ -65,7 +65,8 @@ test_expect_success "$name" "
6565 git update-index --add dir/file/file &&
6666 git commit -m '$name ' &&
6767 test_must_fail git svn set-tree --find-copies-harder --rmdir \
68- ${remotes_git_svn} ..mybranch" || true
68+ ${remotes_git_svn} ..mybranch
69+ "
6970
7071
7172name=' detect node change from directory to file #1'
@@ -79,7 +80,8 @@ test_expect_success "$name" '
7980 git update-index --add -- bar &&
8081 git commit -m "$name" &&
8182 test_must_fail git svn set-tree --find-copies-harder --rmdir \
82- ${remotes_git_svn}..mybranch2' || true
83+ ${remotes_git_svn}..mybranch2
84+ '
8385
8486
8587name=' detect node change from file to directory #2'
@@ -96,7 +98,8 @@ test_expect_success "$name" '
9698 ${remotes_git_svn}..mybranch3 &&
9799 svn_cmd up "$SVN_TREE" &&
98100 test -d "$SVN_TREE"/bar/zzz &&
99- test -e "$SVN_TREE"/bar/zzz/yyy ' || true
101+ test -e "$SVN_TREE"/bar/zzz/yyy
102+ '
100103
101104name=' detect node change from directory to file #2'
102105test_expect_success " $name " '
@@ -109,7 +112,8 @@ test_expect_success "$name" '
109112 git update-index --add -- dir &&
110113 git commit -m "$name" &&
111114 test_must_fail git svn set-tree --find-copies-harder --rmdir \
112- ${remotes_git_svn}..mybranch4' || true
115+ ${remotes_git_svn}..mybranch4
116+ '
113117
114118
115119name=' remove executable bit from a file'
@@ -162,7 +166,7 @@ test_expect_success "$name" '
162166
163167name=' modify a symlink to become a file'
164168test_expect_success " $name " '
165- echo git help > help || true &&
169+ echo git help >help &&
166170 rm exec-2.sh &&
167171 cp help exec-2.sh &&
168172 git update-index exec-2.sh &&
0 commit comments