Merge branch 'sb/submodule-module-list-pathspec-fix'

gitster · gitster · commit 4f5067010d16 · 2016-05-13T13:18:28.000-07:00
* sb/submodule-module-list-pathspec-fix:
  submodule deinit test: fix broken &amp;&amp; chain in subshell
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
@@ -898,7 +898,7 @@ test_expect_success 'submodule deinit works on repository without submodules' '
 		git init &&
 		>file &&
 		git add file &&
-		git commit -m "repo should not be empty"
+		git commit -m "repo should not be empty" &&
 		git submodule deinit .
 	)
 '

Original file line number	Diff line number	Diff line change
`@@ -898,7 +898,7 @@ test_expect_success 'submodule deinit works on repository without submodules' '`
`898`	`898`	`git init &&`
`899`	`899`	`>file &&`
`900`	`900`	`git add file &&`
`901`		`- git commit -m "repo should not be empty"`
	`901`	`+ git commit -m "repo should not be empty" &&`
`902`	`902`	`git submodule deinit .`
`903`	`903`	`)`
`904`	`904`	`'`