diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2015-03-20 15:32:55 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-03-20 12:37:05 -0700 |
| commit | 49383dd431b5897652708ed05da305d639bdb8cc (patch) | |
| tree | 0e11f5b7a3ba36f0849a6fb02a55c0b53ba0fba5 /t/t9158-git-svn-mergeinfo.sh | |
| parent | t9104: fix test for following larger parents (diff) | |
| download | tgif-49383dd431b5897652708ed05da305d639bdb8cc.tar.xz | |
t9158, t9161: fix broken &&-chain in git-svn tests
All of these cases are moderate since they would most probably not
lead to missed failing tests; either they would fail otherwise, or
fail a rm in test_when_finished only.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9158-git-svn-mergeinfo.sh')
| -rwxr-xr-x | t/t9158-git-svn-mergeinfo.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9158-git-svn-mergeinfo.sh b/t/t9158-git-svn-mergeinfo.sh index 8c9539e1b4..13f78f2682 100755 --- a/t/t9158-git-svn-mergeinfo.sh +++ b/t/t9158-git-svn-mergeinfo.sh @@ -34,7 +34,7 @@ test_expect_success 'change svn:mergeinfo' ' ' test_expect_success 'verify svn:mergeinfo' ' - mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) + mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) && test "$mergeinfo" = "/branches/foo:1-10" ' @@ -46,7 +46,7 @@ test_expect_success 'change svn:mergeinfo multiline' ' ' test_expect_success 'verify svn:mergeinfo multiline' ' - mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) + mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) && test "$mergeinfo" = "/branches/bar:1-10 /branches/other:3-5,8,10-11" ' |