Merge branch 'np/log-graph-octopus-fix'

diff --git a/t/t9165-git-svn-fetch-merge-branch-of-branch.sh b/t/t9165-git-svn-fetch-merge-branch-of-branch.sh
index fa3ef3b1f7408840cabc5eacb1b1851f1c8afaac..a4813c2b09ce9f508fb38b463f8bbcd48851e1d2 100755 (executable)
--- a/t/t9165-git-svn-fetch-merge-branch-of-branch.sh
+++ b/t/t9165-git-svn-fetch-merge-branch-of-branch.sh
@@ -39,7 +39,7 @@ test_expect_success 'initialize source svn repo' '
                svn_cmd commit -m trunk &&
                svn_cmd switch "$svnrepo"/branches/branch2 &&
                svn_cmd merge "$svnrepo"/trunk &&
-               svn_cmd commit -m "merge trunk"
+               svn_cmd commit -m "merge trunk" &&
                svn_cmd switch "$svnrepo"/trunk &&
                svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 &&
                svn_cmd commit -m "merge branch2"