diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-26 14:09:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-26 14:09:32 -0700 |
| commit | 6968ca9b255d1ee327c36bdd79418aa8d8b2c38f (patch) | |
| tree | 9ab6f75ecb3840b3739e735ef342e52fbd2b93b7 | |
| parent | 54e6ce5960689026f1ea97db493dc8cd0a7f8e1e (diff) | |
| parent | 4fced24712b205fb4998878b9000b9d42dc089b6 (diff) | |
| download | git-6968ca9b255d1ee327c36bdd79418aa8d8b2c38f.tar.gz | |
Merge branch 'ks/t7508-indent-fix'
Cosmetic update to a test.
* ks/t7508-indent-fix:
t7508: fix a broken indentation
| -rwxr-xr-x | t/t7508-status.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 7121a550c7..f7fe22a195 100755 --- 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 ' |