diff options
| author | Brian M. Carlson <sandals@crustytoothpaste.net> | 2013-09-01 20:06:49 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 13:53:11 -0700 |
| commit | 927b26f87a5654349b87d3217ed8e9360d9ff798 (patch) | |
| tree | c70937e4e032963f161ad0fe5edd9a9103c115c3 /t/t7401-submodule-summary.sh | |
| parent | 2be945094ef753a47fa85d54dd472351f77c398c (diff) | |
| download | git-927b26f87a5654349b87d3217ed8e9360d9ff798.tar.gz git-927b26f87a5654349b87d3217ed8e9360d9ff798.tar.xz | |
submodule: don't print status output with ignore=all
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.
Not ignored are submodules that are added, deleted, or moved (which is
essentially a combination of the first two) because it is not easily possible to
determine the old path once a move has occurred, nor is it easily possible to
detect which adds and deletions are moves and which are not. This also
preserves the previous behavior of always listing modules which are to be
deleted.
Tests are included which verify that this change has no effect on git submodule
summary without the --for-status option.
Signed-off-by: Brian M. Carlson <sandals@crustytoothpaste.net>
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7401-submodule-summary.sh')
| -rwxr-xr-x | t/t7401-submodule-summary.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index ac2434c0d..81ae7c91a 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -104,6 +104,24 @@ EOF test_cmp expected actual " +test_expect_success 'no ignore=all setting has any effect' " + git config -f .gitmodules submodule.sm1.path sm1 && + git config -f .gitmodules submodule.sm1.ignore all && + git config submodule.sm1.ignore all && + git config diff.ignoreSubmodules all && + git submodule summary >actual && + cat >expected <<-EOF && +* sm1 $head1...$head2 (1): + > Add foo3 + +EOF + test_cmp expected actual && + git config --unset diff.ignoreSubmodules && + git config --remove-section submodule.sm1 && + git config -f .gitmodules --remove-section submodule.sm1 +" + + commit_file sm1 && head3=$( cd sm1 && |