diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:59:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:59:03 -0700 |
| commit | 8f3a16c390f428af64b8d34d587cc482b70f8666 (patch) | |
| tree | 7441588c0cd49bafb66bd12b475798d844e1e23e | |
| parent | dbcf77592a8d7f6f5f88c0fcf3044867a3994314 (diff) | |
| parent | 4fced24712b205fb4998878b9000b9d42dc089b6 (diff) | |
| download | git-8f3a16c390f428af64b8d34d587cc482b70f8666.tar.gz | |
Merge branch 'ks/t7508-indent-fix' into maint
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 5edcc6edfe..35ea0b7074 100755 --- 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 ' |