Sync with v2.3.4

diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 665607c9cbe5a07f83d4ae4c769060108bddbd9c..5b562122a16f231b00f7fb8090992f49d4950d82 100755 (executable)
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -145,7 +145,7 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
                test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1
        ) &&
        cat errs &&
-       ! test_i18ngrep Traceback errs
+       test_i18ngrep ! Traceback errs
 '
 
 # Hide a file from p4d, make sure we catch its complaint.  This won't fail in