From: Stefan Beller <sbeller@google.com>
To: jrnieder@gmail.com
Cc: gitster@pobox.com, git@vger.kernel.org, Jens.Lehmann@web.de,
pclouds@gmail.com, Stefan Beller <sbeller@google.com>
Subject: [PATCH 12/15] git submodule summary respects groups
Date: Tue, 26 Apr 2016 13:50:30 -0700 [thread overview]
Message-ID: <1461703833-10350-13-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1461703833-10350-1-git-send-email-sbeller@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
git-submodule.sh | 5 +++++
t/t7413-submodule--helper.sh | 26 ++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/git-submodule.sh b/git-submodule.sh
index 253ad07..f065b1f 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -833,6 +833,11 @@ cmd_summary() {
sane_egrep '^:([0-7]* )?160000' |
while read mod_src mod_dst sha1_src sha1_dst status sm_path
do
+ # ignore modules not in group
+ if ! git submodule--helper in-group $sm_path
+ then
+ continue
+ fi
# Always show modules deleted or type-changed (blob<->module)
if test "$status" = D || test "$status" = T
then
diff --git a/t/t7413-submodule--helper.sh b/t/t7413-submodule--helper.sh
index 39e469f..d01cdc6 100755
--- a/t/t7413-submodule--helper.sh
+++ b/t/t7413-submodule--helper.sh
@@ -226,4 +226,30 @@ test_expect_success 'git submodule update respects groups' '
test_cmp expect actual
'
+range_back="$(echo $submodule_sha1|cut -c1-7)...$(echo $sub_priorsha1|cut -c1-7)"
+cat >expect <<-EOF
+* sub0 $range_back (1):
+ < test2
+
+* sub1 $range_back (1):
+ < test2
+
+* sub3 $range_back (1):
+ < test2
+
+EOF
+
+test_expect_success 'git submodule summary respects groups' '
+ (
+ cd super_clone &&
+ git submodule update --init &&
+ git submodule foreach "git checkout HEAD^" &&
+ git config --add submodule.defaultGroup *bit1 &&
+ git config --add submodule.defaultGroup ./sub0 &&
+ git submodule summary >../actual &&
+ git config --unset-all submodule.defaultGroup
+ ) &&
+ test_cmp expect actual
+'
+
test_done
--
2.8.0.41.g8d9aeb3
next prev parent reply other threads:[~2016-04-26 20:51 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 20:50 [PATCH 00/15] submodule groups (once again) Stefan Beller
2016-04-26 20:50 ` [PATCH 01/15] string_list: add string_list_duplicate Stefan Beller
2016-04-26 22:37 ` Junio C Hamano
2016-04-27 18:02 ` Stefan Beller
2016-04-27 21:11 ` Junio C Hamano
2016-04-27 21:17 ` Stefan Beller
2016-04-27 23:17 ` Junio C Hamano
2016-04-27 23:24 ` Stefan Beller
2016-04-26 20:50 ` [PATCH 02/15] submodule doc: write down what we want to achieve in this series Stefan Beller
2016-04-26 22:42 ` Junio C Hamano
2016-04-26 20:50 ` [PATCH 03/15] submodule add: label submodules if asked to Stefan Beller
2016-04-26 22:49 ` Junio C Hamano
2016-04-26 22:50 ` Jacob Keller
2016-04-26 23:19 ` Stefan Beller
2016-04-27 3:24 ` Jacob Keller
2016-04-26 20:50 ` [PATCH 04/15] submodule-config: keep labels around Stefan Beller
2016-04-26 20:50 ` [PATCH 05/15] submodule-config: check if submodule a submodule is in a group Stefan Beller
2016-04-26 22:58 ` Junio C Hamano
2016-04-26 23:17 ` Junio C Hamano
2016-04-27 23:00 ` Stefan Beller
2016-04-26 20:50 ` [PATCH 06/15] submodule init: redirect stdout to stderr Stefan Beller
2016-04-29 18:27 ` Junio C Hamano
2016-04-29 18:38 ` Stefan Beller
2016-04-26 20:50 ` [PATCH 07/15] submodule deinit: loose requirement for giving '.' Stefan Beller
2016-04-29 18:27 ` Junio C Hamano
2016-04-26 20:50 ` [PATCH 08/15] submodule--helper list: respect submodule groups Stefan Beller
2016-04-29 18:31 ` Junio C Hamano
2016-04-26 20:50 ` [PATCH 09/15] submodule--helper init: " Stefan Beller
2016-04-26 20:50 ` [PATCH 10/15] submodule--helper update_clone: " Stefan Beller
2016-04-26 20:50 ` [PATCH 11/15] diff: ignore submodules excluded by groups Stefan Beller
2016-04-29 18:37 ` Junio C Hamano
2016-04-29 19:17 ` Stefan Beller
2016-05-05 19:57 ` Stefan Beller
2016-05-05 20:19 ` Junio C Hamano
2016-05-05 21:02 ` Stefan Beller
2016-05-05 22:20 ` Junio C Hamano
2016-05-05 22:50 ` Stefan Beller
2016-05-05 23:07 ` Junio C Hamano
2016-05-06 6:08 ` Junio C Hamano
2016-05-06 18:23 ` Stefan Beller
2016-05-06 18:59 ` Junio C Hamano
2016-04-26 20:50 ` Stefan Beller [this message]
2016-04-29 18:38 ` [PATCH 12/15] git submodule summary respects groups Junio C Hamano
2016-04-26 20:50 ` [PATCH 13/15] cmd_status: respect submodule groups Stefan Beller
2016-04-26 20:50 ` [PATCH 14/15] cmd_diff: " Stefan Beller
2016-04-26 20:50 ` [PATCH 15/15] clone: allow specification of submodules to be cloned Stefan Beller
2016-04-26 22:19 ` [PATCH 00/15] submodule groups (once again) Junio C Hamano
2016-04-26 22:26 ` Junio C Hamano
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=1461703833-10350-13-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=pclouds@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).