Merge branch 'es/want-color-fd-defensive'

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 804ce3850ff3f7838035fd316e26ee301b525ff0..5dfee07d9add00d4a68e70c89c8711604f218ef1 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
 '