summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hord <hordp@cisco.com>2013-08-09 16:12:54 -0400
committerJunio C Hamano <gitster@pobox.com>2013-08-09 14:00:54 -0700
commitdfe338ae139432fd40a0f211b267f98ef85c29ed (patch)
tree7dc43508ae274b36d6c797200a4ae082be83dcea
parent091a6eb0feed820a43663ca63dc2bc0bb247bbae (diff)
downloadgit-dfe338ae139432fd40a0f211b267f98ef85c29ed.tar.gz
t/t7407: fix two typos in submodule testsjk/submodule-subdirectory-ok
In t/t7407-submodule-foreach.sh there is a typo in one of the path names given for a test step. The correct path is nested1/nested2/.git, but nested1/nested1/nested2/.git is given instead. The typo is hidden because this line also accidentally omits the && chain operator. The omitted chain also means the return values of all the previous commands in this test are also being ignored. Fix the path and add the chain operator so the entire test sequence can be properly validated. Signed-off-by: Phil Hord <hordp@cisco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-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
)
'