summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-08-09 14:30:41 -0700
committerJunio C Hamano <gitster@pobox.com>2013-08-09 14:30:41 -0700
commite423a0f8a240779138849d04ff34be5768f3c25f (patch)
tree8bdedda47ab34a8a155c0b79ff4be58a1f7eebb0
parent6f7d6ec303898a8223b9bad5f010a514b42c1b73 (diff)
parentdfe338ae139432fd40a0f211b267f98ef85c29ed (diff)
downloadgit-e423a0f8a240779138849d04ff34be5768f3c25f.tar.gz
Merge branch 'jk/submodule-subdirectory-ok'
* jk/submodule-subdirectory-ok: t/t7407: fix two typos in submodule tests
-rwxr-xr-xt/t7407-submodule-foreach.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 91d4fd1fac..be93f10cf0 100755
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -145,7 +145,7 @@ test_expect_success 'use "submodule foreach" to checkout 2nd level submodule' '
git rev-parse --resolve-git-dir nested1/.git &&
test_must_fail git rev-parse --resolve-git-dir nested1/nested2/.git &&
git submodule foreach "git submodule update --init" &&
- git rev-parse --resolve-git-dir nested1/nested1/nested2/.git
+ git rev-parse --resolve-git-dir nested1/nested2/.git &&
test_must_fail git rev-parse --resolve-git-dir nested1/nested2/nested3/.git
)
'