Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t9100: remove bogus " || test" after each test scriptlet
author
Junio C Hamano
<gitster@pobox.com>
Wed, 22 Feb 2012 05:10:33 +0000
(21:10 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 22 Feb 2012 05:10:33 +0000
(21:10 -0800)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t9100-git-svn-basic.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
675fff4
)
diff --git
a/t/t9100-git-svn-basic.sh
b/t/t9100-git-svn-basic.sh
index 4029f844c4e2a34e6408468fd4f0f8d1da110b97..749b75e8d4fba546b22a0280b72891c38b5ea00a 100755
(executable)
--- a/
t/t9100-git-svn-basic.sh
+++ b/
t/t9100-git-svn-basic.sh
@@
-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 \
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'
name='detect node change from directory to file #1'
@@
-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 \
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'
name='detect node change from file to directory #2'
@@
-96,7
+98,8
@@
test_expect_success "$name" '
${remotes_git_svn}..mybranch3 &&
svn_cmd up "$SVN_TREE" &&
test -d "$SVN_TREE"/bar/zzz &&
${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" '
name='detect node change from directory to file #2'
test_expect_success "$name" '
@@
-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 \
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'
name='remove executable bit from a file'
@@
-162,7
+166,7
@@
test_expect_success "$name" '
name='modify a symlink to become a file'
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 &&
rm exec-2.sh &&
cp help exec-2.sh &&
git update-index exec-2.sh &&