Merge branch 'jk/submodule-subdirectory-ok'

gitster · gitster · commit e423a0f8a240 · 2013-08-09T14:30:41.000-07:00
* jk/submodule-subdirectory-ok:
  t/t7407: fix two typos in submodule tests
diff --git 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
 	)
 '

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ test_expect_success 'use "submodule foreach" to checkout 2nd level submodule' '`
`145`	`145`	`git rev-parse --resolve-git-dir nested1/.git &&`
`146`	`146`	`test_must_fail git rev-parse --resolve-git-dir nested1/nested2/.git &&`
`147`	`147`	`git submodule foreach "git submodule update --init" &&`
`148`		`- git rev-parse --resolve-git-dir nested1/nested1/nested2/.git`
	`148`	`+ git rev-parse --resolve-git-dir nested1/nested2/.git &&`
`149`	`149`	`test_must_fail git rev-parse --resolve-git-dir nested1/nested2/nested3/.git`
`150`	`150`	`)`
`151`	`151`	`'`