Merge branch 'jl/maint-diff-ignore-submodules'

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index 2332fa6798d9e40e83a07a318675e70d9b3169aa..9d70f9d731325287dd7e9f83e5e3b44ad1dfb8d9 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3169,7 +3169,16 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
                DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
        else if (!strcmp(arg, "--ignore-submodules"))
                DIFF_OPT_SET(options, IGNORE_SUBMODULES);
-       else if (!strcmp(arg, "--submodule"))
+       else if (!prefixcmp(arg, "--ignore-submodules=")) {
+               if (!strcmp(arg + 20, "all"))
+                       DIFF_OPT_SET(options, IGNORE_SUBMODULES);
+               else if (!strcmp(arg + 20, "untracked"))
+                       DIFF_OPT_SET(options, IGNORE_UNTRACKED_IN_SUBMODULES);
+               else if (!strcmp(arg + 20, "dirty"))
+                       DIFF_OPT_SET(options, IGNORE_DIRTY_SUBMODULES);
+               else
+                       die("bad --ignore-submodules argument: %s", arg + 20);
+       } else if (!strcmp(arg, "--submodule"))
                DIFF_OPT_SET(options, SUBMODULE_LOG);
        else if (!prefixcmp(arg, "--submodule=")) {
                if (!strcmp(arg + 12, "log"))