use struct sha1_array in diff_tree_combined()

diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 69115269c2a284dcfc99abd2f7feb3d87f4e5bcc..695f7afdf31cc589e9c31d764d1e713ad64240c0 100755 (executable)
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -362,10 +362,10 @@ test_expect_success 'update --init' '
        git submodule update init > update.out &&
        cat update.out &&
        test_i18ngrep "not initialized" update.out &&
-       ! test -d init/.git &&
+       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' '