Merge branch 'ls/p4-retry-thrice'

diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index 400e2b1439a9e7fa329f78b8c5d600f34cf375d2..d389ae5408ab783467f64368adc01325e258046b 100755 (executable)
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh
@@ -89,7 +89,21 @@ test_expect_success 'error message contains blob reference' '
                        HEAD b \
                        HEAD submodule \
                                2>actual_err &&
-               grep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
+               test_i18ngrep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
+       )
+'
+
+test_expect_success 'using different treeishs works' '
+       (
+               cd super &&
+               git tag new_tag &&
+               tree=$(git rev-parse HEAD^{tree}) &&
+               commit=$(git rev-parse HEAD^{commit}) &&
+               test-submodule-config $commit b >expect &&
+               test-submodule-config $tree b >actual.1 &&
+               test-submodule-config new_tag b >actual.2 &&
+               test_cmp expect actual.1 &&
+               test_cmp expect actual.2
        )
 '