Submodules: Use "ignore" settings from .gitmodules too for diff and status

The .gitmodules file is parsed for "submodule.<name>.ignore" entries
before looking for them in .git/config. Thus settings found in .git/config
will override those from .gitmodules, thereby allowing the local developer
to ignore settings given by the remote side while also letting upstream
set defaults for those users who don't have special needs.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5ca09aed9055d1d0fb19b0e434c0e835169433ec..c88a63764c84d9f049aa0d1c060a17ba4b5939ac 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1752,6 +1752,9 @@ submodule.<name>.ignore::
        let submodules with modified tracked files in their work tree show up.
        Using "none" (the default when this option is not set) also shows
        submodules that have untracked files in their work tree as changed.
        let submodules with modified tracked files in their work tree show up.
        Using "none" (the default when this option is not set) also shows
        submodules that have untracked files in their work tree as changed.

+       This setting overrides any setting made in .gitmodules for this submodule,
+       both settings can be overriden on the command line by using the
+       "--ignore-submodule" option.

 
 tar.umask::
        This variable can be used to restrict the permission bits of
 
 tar.umask::
        This variable can be used to restrict the permission bits of

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 9cf7506626e5ba66116f23c69627a7de36ad515f..faa467b03297fa61584a6a75745e3fe1b78c8e21 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -334,7 +334,7 @@ endif::git-format-patch[]
        Using "none" will consider the submodule modified when it either contains
        untracked or modified files or its HEAD differs from the commit recorded
        in the superproject and can be used to override any settings of the
        Using "none" will consider the submodule modified when it either contains
        untracked or modified files or its HEAD differs from the commit recorded
        in the superproject and can be used to override any settings of the

-       'ignore' option in linkgit:git-config[1]. When
+       'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When

        "untracked" is used submodules are not considered dirty when they only
        contain untracked content (but they are still scanned for modified
        content). Using "dirty" ignores all changes to the work tree of submodules,
        "untracked" is used submodules are not considered dirty when they only
        contain untracked content (but they are still scanned for modified
        content). Using "dirty" ignores all changes to the work tree of submodules,

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index a7a5d79416aea3df31bfed22b1af52098aa79067..dae190a5f21d3835024ce263bf4bd9b08048cfa6 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -59,7 +59,7 @@ specified.
        Using "none" will consider the submodule modified when it either contains
        untracked or modified files or its HEAD differs from the commit recorded
        in the superproject and can be used to override any settings of the
        Using "none" will consider the submodule modified when it either contains
        untracked or modified files or its HEAD differs from the commit recorded
        in the superproject and can be used to override any settings of the

-       'ignore' option in linkgit:git-config[1]. When
+       'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When

        "untracked" is used submodules are not considered dirty when they only
        contain untracked content (but they are still scanned for modified
        content). Using "dirty" ignores all changes to the work tree of submodules,
        "untracked" is used submodules are not considered dirty when they only
        contain untracked content (but they are still scanned for modified
        content). Using "dirty" ignores all changes to the work tree of submodules,

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 72a13d18e019ef00de0e8a79bbe5fe4651ab8dba..8ae107da250ff01b17b5215a474c781a0f0ae57a 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -44,6 +44,21 @@ submodule.<name>.update::
        This config option is overridden if 'git submodule update' is given
        the '--merge' or '--rebase' options.
 
        This config option is overridden if 'git submodule update' is given
        the '--merge' or '--rebase' options.
 

+submodule.<name>.ignore::
+       Defines under what circumstances "git status" and the diff family show
+       a submodule as modified. When set to "all", it will never be considered
+       modified, "dirty" will ignore all changes to the submodules work tree and
+       takes only differences between the HEAD of the submodule and the commit
+       recorded in the superproject into account. "untracked" will additionally
+       let submodules with modified tracked files in their work tree show up.
+       Using "none" (the default when this option is not set) also shows
+       submodules that have untracked files in their work tree as changed.
+       If this option is also present in the submodules entry in .git/config of
+       the superproject, the setting there will override the one found in
+       .gitmodules.
+       Both settings can be overriden on the command line by using the
+       "--ignore-submodule" option.
+

 
 EXAMPLES
 --------
 
 EXAMPLES
 --------

diff --git a/builtin/commit.c b/builtin/commit.c
index a78dbd83bf04c7080487b8508321d79d848e9b1f..9456f4a58b7097e8b880619feb4a19b3cd6fd447 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -25,6 +25,7 @@
 #include "rerere.h"
 #include "unpack-trees.h"
 #include "quote.h"
 #include "rerere.h"
 #include "unpack-trees.h"
 #include "quote.h"

+#include "submodule.h"

 
 static const char * const builtin_commit_usage[] = {
        "git commit [options] [--] <filepattern>...",
 
 static const char * const builtin_commit_usage[] = {
        "git commit [options] [--] <filepattern>...",


@@ -1073,6 +1074,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
                status_format = STATUS_FORMAT_PORCELAIN;
 
        wt_status_prepare(&s);
                status_format = STATUS_FORMAT_PORCELAIN;
 
        wt_status_prepare(&s);

+       gitmodules_config();

        git_config(git_status_config, &s);
        in_merge = file_exists(git_path("MERGE_HEAD"));
        argc = parse_options(argc, argv, prefix,
        git_config(git_status_config, &s);
        in_merge = file_exists(git_path("MERGE_HEAD"));
        argc = parse_options(argc, argv, prefix,

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 5b64011de8222f06b5c772a6461278dea152919e..951c7c8994704543fc1784c87a17a1aa47ede257 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -8,6 +8,7 @@
 #include "commit.h"
 #include "revision.h"
 #include "builtin.h"
 #include "commit.h"
 #include "revision.h"
 #include "builtin.h"

+#include "submodule.h"

 
 static const char diff_files_usage[] =
 "git diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"
 
 static const char diff_files_usage[] =
 "git diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"


@@ -20,6 +21,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
        unsigned options = 0;
 
        init_revisions(&rev, prefix);
        unsigned options = 0;
 
        init_revisions(&rev, prefix);

+       gitmodules_config();

        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        rev.abbrev = 0;
 
        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        rev.abbrev = 0;
 

diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 04837494feba401c7f689eab5574768d3fd126de..2eb32bd9da8cfa4d7b1b99f9d22ffa5b3d6202e5 100644 (file)
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -3,6 +3,7 @@
 #include "commit.h"
 #include "revision.h"
 #include "builtin.h"
 #include "commit.h"
 #include "revision.h"
 #include "builtin.h"

+#include "submodule.h"

 
 static const char diff_cache_usage[] =
 "git diff-index [-m] [--cached] "
 
 static const char diff_cache_usage[] =
 "git diff-index [-m] [--cached] "


@@ -17,6 +18,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
        int result;
 
        init_revisions(&rev, prefix);
        int result;
 
        init_revisions(&rev, prefix);

+       gitmodules_config();

        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        rev.abbrev = 0;
 
        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        rev.abbrev = 0;
 

diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index 3c78bda5664e20086bcd500105b039d6241e3782..0d2a3e9fa2023cc673f1f6d9e17d3deeca1c7e9d 100644 (file)
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -3,6 +3,7 @@
 #include "commit.h"
 #include "log-tree.h"
 #include "builtin.h"
 #include "commit.h"
 #include "log-tree.h"
 #include "builtin.h"

+#include "submodule.h"

 
 static struct rev_info log_tree_opt;
 
 
 static struct rev_info log_tree_opt;
 


@@ -112,6 +113,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
        int read_stdin = 0;
 
        init_revisions(opt, prefix);
        int read_stdin = 0;
 
        init_revisions(opt, prefix);

+       gitmodules_config();

        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        opt->abbrev = 0;
        opt->diff = 1;
        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        opt->abbrev = 0;
        opt->diff = 1;

diff --git a/builtin/diff.c b/builtin/diff.c
index 89ae89cde1e6d8a0a2e02209f5396263a81bda5b..a43d3263638daf083c52f37f3bd0872327d7459b 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -13,6 +13,7 @@
 #include "revision.h"
 #include "log-tree.h"
 #include "builtin.h"
 #include "revision.h"
 #include "log-tree.h"
 #include "builtin.h"

+#include "submodule.h"

 
 struct blobinfo {
        unsigned char sha1[20];
 
 struct blobinfo {
        unsigned char sha1[20];


@@ -279,6 +280,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
         */
 
        prefix = setup_git_directory_gently(&nongit);
         */
 
        prefix = setup_git_directory_gently(&nongit);

+       gitmodules_config();

        git_config(git_diff_ui_config, NULL);
 
        if (diff_use_color_default == -1)
        git_config(git_diff_ui_config, NULL);
 
        if (diff_use_color_default == -1)

diff --git a/submodule.c b/submodule.c
index ff2863074beeb76924ceb20e7f2c18b71c44f88e..dc0f95b73f85f1f677ad6867ede4d6e70a5e0445 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -62,6 +62,25 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
        }
 }
 
        }
 }
 

+static int submodule_config(const char *var, const char *value, void *cb)
+{
+       if (!prefixcmp(var, "submodule."))
+               return parse_submodule_config_option(var, value);
+       return 0;
+}
+
+void gitmodules_config(void)
+{
+       const char *work_tree = get_git_work_tree();
+       if (work_tree) {
+               struct strbuf gitmodules_path = STRBUF_INIT;
+               strbuf_addstr(&gitmodules_path, work_tree);
+               strbuf_addstr(&gitmodules_path, "/.gitmodules");
+               git_config_from_file(submodule_config, gitmodules_path.buf, NULL);
+               strbuf_release(&gitmodules_path);
+       }
+}
+

 int parse_submodule_config_option(const char *var, const char *value)
 {
        int len;
 int parse_submodule_config_option(const char *var, const char *value)
 {
        int len;

diff --git a/submodule.h b/submodule.h
index 185a5ce6c67bc2282de8e5529f07c1a5b3890990..8ac4037b56210d54616dfa68655722b246c26f1b 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -5,6 +5,7 @@ struct diff_options;
 
 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
                const char *path);
 
 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
                const char *path);

+void gitmodules_config();

 int parse_submodule_config_option(const char *var, const char *value);
 void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
 void show_submodule_summary(FILE *f, const char *path,
 int parse_submodule_config_option(const char *var, const char *value);
 void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
 void show_submodule_summary(FILE *f, const char *path,

diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 68367285173d3579c79bcb378b91354564ba8637..1bc6e77a0d5914a7cbf0986bdabc44697e334c27 100755 (executable)
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -139,6 +139,36 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)
        git config --remove-section submodule.subname
 '
 
        git config --remove-section submodule.subname
 '
 

+test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]' '
+       git config --add -f .gitmodules submodule.subname.ignore none &&
+       git config --add -f .gitmodules submodule.subname.path sub &&
+       git diff HEAD >actual &&
+       sed -e "1,/^@@/d" actual >actual.body &&
+       expect_from_to >expect.body $subprev $subprev-dirty &&
+       test_cmp expect.body actual.body &&
+       git config -f .gitmodules submodule.subname.ignore all &&
+       git config -f .gitmodules submodule.subname.path sub &&
+       git diff HEAD >actual2 &&
+       ! test -s actual2 &&
+       git config -f .gitmodules submodule.subname.ignore untracked &&
+       git diff HEAD >actual3 &&
+       sed -e "1,/^@@/d" actual3 >actual3.body &&
+       expect_from_to >expect.body $subprev $subprev-dirty &&
+       test_cmp expect.body actual3.body &&
+       git config -f .gitmodules submodule.subname.ignore dirty &&
+       git diff HEAD >actual4 &&
+       ! test -s actual4 &&
+       git config submodule.subname.ignore none &&
+       git config submodule.subname.path sub &&
+       git diff HEAD >actual &&
+       sed -e "1,/^@@/d" actual >actual.body &&
+       expect_from_to >expect.body $subprev $subprev-dirty &&
+       test_cmp expect.body actual.body &&
+       git config --remove-section submodule.subname &&
+       git config --remove-section -f .gitmodules submodule.subname &&
+       rm .gitmodules
+'
+

 test_expect_success 'git diff HEAD with dirty submodule (index, refs match)' '
        (
                cd sub &&
 test_expect_success 'git diff HEAD with dirty submodule (index, refs match)' '
        (
                cd sub &&


@@ -189,6 +219,28 @@ test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match)
        git config --remove-section submodule.subname
 '
 
        git config --remove-section submodule.subname
 '
 

+test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]' '
+       git config --add -f .gitmodules submodule.subname.ignore all &&
+       git config --add -f .gitmodules submodule.subname.path sub &&
+       git diff HEAD >actual2 &&
+       ! test -s actual2 &&
+       git config -f .gitmodules submodule.subname.ignore untracked &&
+       git diff HEAD >actual3 &&
+       ! test -s actual3 &&
+       git config -f .gitmodules submodule.subname.ignore dirty &&
+       git diff HEAD >actual4 &&
+       ! test -s actual4 &&
+       git config submodule.subname.ignore none &&
+       git config submodule.subname.path sub &&
+       git diff HEAD >actual &&
+       sed -e "1,/^@@/d" actual >actual.body &&
+       expect_from_to >expect.body $subprev $subprev-dirty &&
+       test_cmp expect.body actual.body &&
+       git config --remove-section submodule.subname &&
+       git config --remove-section -f .gitmodules submodule.subname &&
+       rm .gitmodules
+'
+

 test_expect_success 'git diff between submodule commits' '
        git diff HEAD^..HEAD >actual &&
        sed -e "1,/^@@/d" actual >actual.body &&
 test_expect_success 'git diff between submodule commits' '
        git diff HEAD^..HEAD >actual &&
        sed -e "1,/^@@/d" actual >actual.body &&


@@ -222,6 +274,30 @@ test_expect_success 'git diff between submodule commits [.git/config]' '
        git config --remove-section submodule.subname
 '
 
        git config --remove-section submodule.subname
 '
 

+test_expect_success 'git diff between submodule commits [.gitmodules]' '
+       git diff HEAD^..HEAD >actual &&
+       sed -e "1,/^@@/d" actual >actual.body &&
+       expect_from_to >expect.body $subtip $subprev &&
+       test_cmp expect.body actual.body &&
+       git config --add -f .gitmodules submodule.subname.ignore dirty &&
+       git config --add -f .gitmodules submodule.subname.path sub &&
+       git diff HEAD^..HEAD >actual &&
+       sed -e "1,/^@@/d" actual >actual.body &&
+       expect_from_to >expect.body $subtip $subprev &&
+       test_cmp expect.body actual.body &&
+       git config -f .gitmodules submodule.subname.ignore all &&
+       git diff HEAD^..HEAD >actual &&
+       ! test -s actual &&
+       git config submodule.subname.ignore dirty &&
+       git config submodule.subname.path sub &&
+       git diff  HEAD^..HEAD >actual &&
+       sed -e "1,/^@@/d" actual >actual.body &&
+       expect_from_to >expect.body $subtip $subprev &&
+       git config --remove-section submodule.subname &&
+       git config --remove-section -f .gitmodules submodule.subname &&
+       rm .gitmodules
+'
+

 test_expect_success 'git diff (empty submodule dir)' '
        : >empty &&
        rm -rf sub/* sub/.git &&
 test_expect_success 'git diff (empty submodule dir)' '
        : >empty &&
        rm -rf sub/* sub/.git &&

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 57bf2ee272ee83a622f8d9df201d16b944925742..1aae7626155f128342a38ba5471e8c01b89fbd9d 100755 (executable)
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -848,12 +848,23 @@ test_expect_success '--ignore-submodules=untracked suppresses submodules with un
        test_cmp expect output
 '
 
        test_cmp expect output
 '
 

+test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '
+       git config --add -f .gitmodules submodule.subname.ignore untracked &&
+       git config --add -f .gitmodules submodule.subname.path sm &&
+       git status > output &&
+       test_cmp expect output &&
+       git config -f .gitmodules  --remove-section submodule.subname
+'
+

 test_expect_success '.git/config ignore=untracked suppresses submodules with untracked content' '
 test_expect_success '.git/config ignore=untracked suppresses submodules with untracked content' '

+       git config --add -f .gitmodules submodule.subname.ignore none &&
+       git config --add -f .gitmodules submodule.subname.path sm &&

        git config --add submodule.subname.ignore untracked &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&
        git config --add submodule.subname.ignore untracked &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&

-       git config --remove-section submodule.subname
+       git config --remove-section submodule.subname &&
+       git config --remove-section -f .gitmodules submodule.subname

 '
 
 test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '
 '
 
 test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '


@@ -861,12 +872,23 @@ test_expect_success '--ignore-submodules=dirty suppresses submodules with untrac
        test_cmp expect output
 '
 
        test_cmp expect output
 '
 

+test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '
+       git config --add -f .gitmodules submodule.subname.ignore dirty &&
+       git config --add -f .gitmodules submodule.subname.path sm &&
+       git status > output &&
+       test_cmp expect output &&
+       git config -f .gitmodules  --remove-section submodule.subname
+'
+

 test_expect_success '.git/config ignore=dirty suppresses submodules with untracked content' '
 test_expect_success '.git/config ignore=dirty suppresses submodules with untracked content' '

+       git config --add -f .gitmodules submodule.subname.ignore none &&
+       git config --add -f .gitmodules submodule.subname.path sm &&

        git config --add submodule.subname.ignore dirty &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&
        git config --add submodule.subname.ignore dirty &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&

-       git config --remove-section submodule.subname
+       git config --remove-section submodule.subname &&
+       git config -f .gitmodules  --remove-section submodule.subname

 '
 
 test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '
 '
 
 test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '


@@ -875,12 +897,23 @@ test_expect_success '--ignore-submodules=dirty suppresses submodules with modifi
        test_cmp expect output
 '
 
        test_cmp expect output
 '
 

+test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' '
+       git config --add -f .gitmodules submodule.subname.ignore dirty &&
+       git config --add -f .gitmodules submodule.subname.path sm &&
+       git status > output &&
+       test_cmp expect output &&
+       git config -f .gitmodules  --remove-section submodule.subname
+'
+

 test_expect_success '.git/config ignore=dirty suppresses submodules with modified content' '
 test_expect_success '.git/config ignore=dirty suppresses submodules with modified content' '

+       git config --add -f .gitmodules submodule.subname.ignore none &&
+       git config --add -f .gitmodules submodule.subname.path sm &&

        git config --add submodule.subname.ignore dirty &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&
        git config --add submodule.subname.ignore dirty &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&

-       git config --remove-section submodule.subname
+       git config --remove-section submodule.subname &&
+       git config -f .gitmodules  --remove-section submodule.subname

 '
 
 cat > expect << EOF
 '
 
 cat > expect << EOF


@@ -920,12 +953,23 @@ test_expect_success "--ignore-submodules=untracked doesn't suppress submodules w
        test_cmp expect output
 '
 
        test_cmp expect output
 '
 

+test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
+       git config --add -f .gitmodules submodule.subname.ignore untracked &&
+       git config --add -f .gitmodules submodule.subname.path sm &&
+       git status > output &&
+       test_cmp expect output &&
+       git config -f .gitmodules  --remove-section submodule.subname
+'
+

 test_expect_success ".git/config ignore=untracked doesn't suppress submodules with modified content" '
 test_expect_success ".git/config ignore=untracked doesn't suppress submodules with modified content" '

+       git config --add -f .gitmodules submodule.subname.ignore none &&
+       git config --add -f .gitmodules submodule.subname.path sm &&

        git config --add submodule.subname.ignore untracked &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&
        git config --add submodule.subname.ignore untracked &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&

-       git config --remove-section submodule.subname
+       git config --remove-section submodule.subname &&
+       git config -f .gitmodules  --remove-section submodule.subname

 '
 
 head2=$(cd sm && git commit -q -m "2nd commit" foo && git rev-parse --short=7 --verify HEAD)
 '
 
 head2=$(cd sm && git commit -q -m "2nd commit" foo && git rev-parse --short=7 --verify HEAD)


@@ -971,28 +1015,48 @@ test_expect_success "--ignore-submodules=untracked doesn't suppress submodule su
        test_cmp expect output
 '
 
        test_cmp expect output
 '
 

+test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule summary" '
+       git config --add -f .gitmodules submodule.subname.ignore untracked &&
+       git config --add -f .gitmodules submodule.subname.path sm &&
+       git status > output &&
+       test_cmp expect output &&
+       git config -f .gitmodules  --remove-section submodule.subname
+'
+

 test_expect_success ".git/config ignore=untracked doesn't suppress submodule summary" '
 test_expect_success ".git/config ignore=untracked doesn't suppress 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 untracked &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&
        git config --add submodule.subname.ignore untracked &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&

-       git config --remove-section submodule.subname
+       git config --remove-section submodule.subname &&
+       git config -f .gitmodules  --remove-section submodule.subname

 '
 
 test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
        git status --ignore-submodules=dirty > output &&
        test_cmp expect output
 '
 '
 
 test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
        git status --ignore-submodules=dirty > output &&
        test_cmp expect output
 '

+test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" '
+       git config --add -f .gitmodules submodule.subname.ignore dirty &&
+       git config --add -f .gitmodules submodule.subname.path sm &&
+       git status > output &&
+       test_cmp expect output &&
+       git config -f .gitmodules  --remove-section submodule.subname
+'

 
 test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary" '
 
 test_expect_success ".git/config ignore=dirty doesn't suppress 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 dirty &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&
        git config --add submodule.subname.ignore dirty &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&

-       git config --remove-section submodule.subname
+       git config --remove-section submodule.subname &&
+       git config -f .gitmodules  --remove-section submodule.subname

 '
 
 '
 

-

 cat > expect << EOF
 # On branch master
 # Changed but not updated:
 cat > expect << EOF
 # On branch master
 # Changed but not updated:


@@ -1019,12 +1083,23 @@ test_expect_success "--ignore-submodules=all suppresses submodule summary" '
        test_cmp expect output
 '
 
        test_cmp expect output
 '
 

+test_expect_failure '.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 &&
+       test_cmp expect output &&
+       git config -f .gitmodules  --remove-section submodule.subname
+'
+

 test_expect_failure '.git/config ignore=all suppresses submodule summary' '
 test_expect_failure '.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 &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&
        git config --add submodule.subname.ignore all &&
        git config --add submodule.subname.path sm &&
        git status > output &&
        test_cmp expect output &&

-       git config --remove-section submodule.subname
+       git config --remove-section submodule.subname &&
+       git config -f .gitmodules  --remove-section submodule.subname

 '
 
 test_done
 '
 
 test_done