From 927b26f87a5654349b87d3217ed8e9360d9ff798 Mon Sep 17 00:00:00 2001 From: "Brian M. Carlson" Date: Sun, 1 Sep 2013 20:06:49 +0000 Subject: 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..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 Acked-by: Jens Lehmann Signed-off-by: Junio C Hamano --- t/t7401-submodule-summary.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 't/t7401-submodule-summary.sh') diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index ac2434c0db..81ae7c91a1 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 && -- cgit v1.2.1