Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ks/t7508-indent-fix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 10 Jul 2017 20:59:03 +0000
(13:59 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 10 Jul 2017 20:59:03 +0000
(13:59 -0700)
Cosmetic update to a test.
* ks/t7508-indent-fix:
t7508: fix a broken indentation
t/t7508-status.sh
patch
|
blob
|
history
raw
(from parent 1:
dbcf775
)
diff --git
a/t/t7508-status.sh
b/t/t7508-status.sh
index 5edcc6edfe651f638921b9148be9579312a47adc..35ea0b707474342a323e02ce614e736c1acfe2eb 100755
(executable)
--- 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
'