Merge branch 'ds/push-squelch-ambig-warning'

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 804ce3850ff3f7838035fd316e26ee301b525ff0..251fdd66c47b5e378cf091a47ba1f804eb74c487 100755 (executable)
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -135,7 +135,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
 
        (cd module-git &&
         git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
-        git log --format="o_fortuna 1.2 %H" -1 HEAD^
+        git log --format="o_fortuna 1.2 %H" -1 HEAD^ &&
         git log --format="tick 1.1 %H" -1 HEAD) > expected &&
        test_cmp expected module-git/.git/cvs-revisions
 '
@@ -148,7 +148,7 @@ test_expect_success PERL 'import from a CVS working tree' '
                git cvsimport -a -z0 &&
                echo 1 >expect &&
                git log -1 --pretty=format:%s%n >actual &&
-               test_cmp actual expect
+               test_cmp expect actual
        )
 
 '