Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ks/t7508-indent-fix'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 26 Jun 2017 21:09:32 +0000
(14:09 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 26 Jun 2017 21:09:32 +0000
(14:09 -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:
54e6ce5
)
diff --git
a/t/t7508-status.sh
b/t/t7508-status.sh
index 7121a550c7ce789d5bcd2bb9a5d8c595e7baaa6a..f7fe22a195e437d5a2aa9c28ea5991b53ae2c7e7 100755
(executable)
--- 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
'