svn: Add && to t9107-git-svn-migrate.sh
It was probably intended for the test to fail unless all of the commands succeed. [ew: fixed tests to actually work] Signed-off-by: Eric Wong <normalperson@yhbt.net>
Adam Brewster committed
Aug 3, 2009 at 21:40 UTC
4ebe6e92c3b62d5192b6cc8158fde701bf2c0dcb
1 file changed
+11
-3
t/t9107-git-svn-migrate.sh
+11
-3
@@ -56,7 +56,15 @@ test_expect_success 'initialize a multi-repository repo' '
56
git config --add svn-remote.svn.fetch "branches/b:refs/remotes/b" &&
57
for i in tags/0.1 tags/0.2 tags/0.3; do
58
git config --add svn-remote.svn.fetch \
59
- $i:refs/remotes/$i || exit 1; done
59
+ $i:refs/remotes/$i || exit 1; done &&
60
+ git config --get-all svn-remote.svn.fetch > fetch.out &&
61
+ grep "^trunk:refs/remotes/trunk$" fetch.out &&
62
+ grep "^branches/a:refs/remotes/a$" fetch.out &&
63
+ grep "^branches/b:refs/remotes/b$" fetch.out &&
64
+ grep "^tags/0\.1:refs/remotes/tags/0\.1$" fetch.out &&
65
+ grep "^tags/0\.2:refs/remotes/tags/0\.2$" fetch.out &&
66
+ grep "^tags/0\.3:refs/remotes/tags/0\.3$" fetch.out &&
67
+ grep "^:refs/${remotes_git_svn}" fetch.out
68
'
69
70
# refs should all be different, but the trees should all be the same:
@@ -86,14 +94,14 @@ test_expect_success 'migrate --minimize on old inited layout' '
94
echo "$svnrepo"$path > "$GIT_DIR"/svn/$ref/info/url ) || exit 1;
95
done &&
96
git svn migrate --minimize &&
89
- test -z "`git config -l |grep -v "^svn-remote\.git-svn\."`" &&
97
+ test -z "`git config -l | grep "^svn-remote\.git-svn\."`" &&
98
git config --get-all svn-remote.svn.fetch > fetch.out &&
99
grep "^trunk:refs/remotes/trunk$" fetch.out &&
100
grep "^branches/a:refs/remotes/a$" fetch.out &&
101
grep "^branches/b:refs/remotes/b$" fetch.out &&
102
grep "^tags/0\.1:refs/remotes/tags/0\.1$" fetch.out &&
103
grep "^tags/0\.2:refs/remotes/tags/0\.2$" fetch.out &&
96
- grep "^tags/0\.3:refs/remotes/tags/0\.3$" fetch.out
104
+ grep "^tags/0\.3:refs/remotes/tags/0\.3$" fetch.out &&
105
grep "^:refs/${remotes_git_svn}" fetch.out
106
'
107