From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: judge.packham@gmail.com, iveqy@iveqy.com,
Jorge-Juan.Garcia-Garcia@ensimag.imag.fr, gitster@pobox.com
Subject: [PATCH 2/2] submodule: don't print status output with ignore=all
Date: Sat, 3 Aug 2013 17:14:20 +0000 [thread overview]
Message-ID: <1375550060-5406-3-git-send-email-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <1375550060-5406-1-git-send-email-sandals@crustytoothpaste.net>
git status prints information for submodules, but it should ignore the status of
those which have submodule.<name>.ignore set to all. Fix it so that it does
properly ignore those which have that setting either in .git/config or in
.gitmodules.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
git-submodule.sh | 2 ++
t/t7508-status.sh | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 30b7fc1..5694ae6 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -1034,6 +1034,8 @@ cmd_summary() {
sane_egrep '^:([0-7]* )?160000' |
while read mod_src mod_dst sha1_src sha1_dst status path
do
+ name=$(module_name "$path")
+ test $(get_submodule_config "$name" ignore none) = all && continue
# Always show modules deleted or type-changed (blob<->module)
test $status = D -o $status = T && echo "$path" && continue
# Also show added or modified modules which are checked out
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index ac3d0fe..fb89fb9 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -1316,7 +1316,7 @@ test_expect_success "--ignore-submodules=all suppresses submodule summary" '
test_i18ncmp expect output
'
-test_expect_failure '.gitmodules ignore=all suppresses submodule summary' '
+test_expect_success '.gitmodules ignore=all suppresses submodule summary' '
git config --add -f .gitmodules submodule.subname.ignore all &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status > output &&
@@ -1324,7 +1324,7 @@ test_expect_failure '.gitmodules ignore=all suppresses submodule summary' '
git config -f .gitmodules --remove-section submodule.subname
'
-test_expect_failure '.git/config ignore=all suppresses submodule summary' '
+test_expect_success '.git/config ignore=all suppresses submodule summary' '
git config --add -f .gitmodules submodule.subname.ignore none &&
git config --add -f .gitmodules submodule.subname.path sm &&
git config --add submodule.subname.ignore all &&
--
1.8.4.rc1
next prev parent reply other threads:[~2013-08-03 17:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-03 17:14 Don't print status output with submodule.<name>.ignore=all brian m. carlson
2013-08-03 17:14 ` [PATCH 1/2] submodule: fix confusing variable name brian m. carlson
2013-08-03 18:14 ` Jonathan Nieder
2013-08-04 17:34 ` Jens Lehmann
2013-08-04 21:29 ` Fredrik Gustafsson
2013-08-06 17:33 ` Jens Lehmann
2013-08-08 17:44 ` Ramsay Jones
2013-08-09 17:26 ` Fredrik Gustafsson
2013-08-09 18:53 ` Junio C Hamano
2013-08-11 19:53 ` Mark Levedahl
2013-08-03 17:14 ` brian m. carlson [this message]
2013-08-03 18:24 ` [PATCH 2/2] submodule: don't print status output with ignore=all Jonathan Nieder
2013-08-04 18:24 ` Jens Lehmann
2013-08-10 16:37 ` brian m. carlson
2013-08-11 16:03 ` brian m. carlson
2013-08-11 18:33 ` Jonathan Nieder
2013-08-17 16:27 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1375550060-5406-3-git-send-email-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=Jorge-Juan.Garcia-Garcia@ensimag.imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=iveqy@iveqy.com \
--cc=judge.packham@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).