Merge branch 'ks/t7508-indent-fix' into maint

gitster · gitster · commit 8f3a16c390f4 · 2017-07-10T13:59:03.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
@@ -1494,7 +1494,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
`@@ -1494,7 +1494,7 @@ EOF`
`1494`	`1494`	`test_expect_success 'git commit -m will commit a staged but ignored submodule' '`
`1495`	`1495`	`git commit -uno -m message &&`
`1496`	`1496`	`git status -s --ignore-submodules=dirty >output &&`
`1497`		`- test_i18ngrep ! "^M. sm" output &&`
	`1497`	`+ test_i18ngrep ! "^M. sm" output &&`
`1498`	`1498`	`git config --remove-section submodule.subname &&`
`1499`	`1499`	`git config -f .gitmodules --remove-section submodule.subname`
`1500`	`1500`	`'`