Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html