Merge branch 'ks/t7508-indent-fix'

gitster · gitster · commit 6968ca9b255d · 2017-06-26T14:09:32.000-07:00
Cosmetic update to a test.

* ks/t7508-indent-fix:
  t7508: fix a broken indentation
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
@@ -1603,7 +1603,7 @@ EOF
 test_expect_success 'git commit -m will commit a staged but ignored submodule' '
 	git commit -uno -m message &&
 	git status -s --ignore-submodules=dirty >output &&
-	 test_i18ngrep ! "^M. sm" output &&
+	test_i18ngrep ! "^M. sm" output &&
 	git config --remove-section submodule.subname &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '

Original file line number	Diff line number	Diff line change
`@@ -1603,7 +1603,7 @@ EOF`
`1603`	`1603`	`test_expect_success 'git commit -m will commit a staged but ignored submodule' '`
`1604`	`1604`	`git commit -uno -m message &&`
`1605`	`1605`	`git status -s --ignore-submodules=dirty >output &&`
`1606`		`- test_i18ngrep ! "^M. sm" output &&`
	`1606`	`+ test_i18ngrep ! "^M. sm" output &&`
`1607`	`1607`	`git config --remove-section submodule.subname &&`
`1608`	`1608`	`git config -f .gitmodules --remove-section submodule.subname`
`1609`	`1609`	`'`