Merge branch 'ds/cvsexportcommit-force-text'

diff --git a/t/t6102-rev-list-unexpected-objects.sh b/t/t6102-rev-list-unexpected-objects.sh
index 28ee1bcb07cfe359133273887bb410929db6493d..28611c978e6c0094a5e452bf8c8c8778da02ae6c 100755 (executable)
--- a/t/t6102-rev-list-unexpected-objects.sh
+++ b/t/t6102-rev-list-unexpected-objects.sh
@@ -67,8 +67,10 @@ test_expect_success 'traverse unexpected non-tree root (lone)' '
        test_must_fail git rev-list --objects $broken_commit
 '
 
-test_expect_failure 'traverse unexpected non-tree root (seen)' '
-       test_must_fail git rev-list --objects $blob $broken_commit
+test_expect_success 'traverse unexpected non-tree root (seen)' '
+       test_must_fail git rev-list --objects $blob $broken_commit \
+               >output 2>&1 &&
+       test_i18ngrep "not a tree" output
 '
 
 test_expect_success 'setup unexpected non-commit tag' '