Merge branch 'maint'

diff --git a/t/t9158-git-svn-mergeinfo.sh b/t/t9158-git-svn-mergeinfo.sh
index 8c9539e1b47a817fff98bad1ed1a99e890386ec9..13f78f2682602014711714a09a8f675c3eed1ff0 100755 (executable)
--- 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"
 '