use struct sha1_array in diff_tree_combined()

diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index c22916ddd91c8a2aee33b8a25f55def0c93b587b..695f7afdf31cc589e9c31d764d1e713ad64240c0 100755 (executable)
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -102,7 +102,7 @@ test_expect_success 'submodule add to .gitignored path fails' '
                git add --force .gitignore &&
                git commit -m"Ignore everything" &&
                ! git submodule add "$submodurl" submod >actual 2>&1 &&
-               test_cmp expect actual
+               test_i18ncmp expect actual
        )
 '
 
@@ -361,11 +361,11 @@ test_expect_success 'update --init' '
 
        git submodule update init > update.out &&
        cat update.out &&
-       grep "not initialized" update.out &&
-       ! test -d init/.git &&
+       test_i18ngrep "not initialized" update.out &&
+       test_must_fail git rev-parse --resolve-git-dir init/.git &&
 
        git submodule update --init init &&
-       test -d init/.git
+       git rev-parse --resolve-git-dir init/.git
 '
 
 test_expect_success 'do not add files from a submodule' '