X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff-lib.c;h=8b8978ae6d1b4d947952b7fe9ec9cea013aaa8c3;hb=88202b9ce6ae09eaeb228104536ecf78ef50f0db;hp=c9f6e05badf7b752188dcb5fa28a9bef53521dee;hpb=e22d62d9151e0e51c3dc4f951fb5d88dc30482c6;p=git.git diff --git a/diff-lib.c b/diff-lib.c index c9f6e05ba..8b8978ae6 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -70,6 +70,7 @@ static int match_stat_with_submodule(struct diff_options *diffopt, int changed = ce_match_stat(ce, st, ce_option); if (S_ISGITLINK(ce->ce_mode) && !DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES) + && !DIFF_OPT_TST(diffopt, IGNORE_DIRTY_SUBMODULES) && (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES))) { *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES)); }