summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2010-03-13 22:00:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-14 05:56:35 (GMT)
commit3bfc45047654c7dd38b32033321228e97fc8f60e (patch)
tree6899c722253819b7d29aa7abb7e0ac7716fa9079 /diff-lib.c
parent85adbf2f751a91429de6b431c45737ba9d7e9e00 (diff)
downloadgit-3bfc45047654c7dd38b32033321228e97fc8f60e.zip
git-3bfc45047654c7dd38b32033321228e97fc8f60e.tar.gz
git-3bfc45047654c7dd38b32033321228e97fc8f60e.tar.bz2
git status: ignoring untracked files must apply to submodules too
Since 1.7.0 submodules are considered dirty when they contain untracked files. But when git status is called with the "-uno" option, the user asked to ignore untracked files, so they must be ignored in submodules too. To achieve this, the new flag DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES is introduced. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-lib.c')
-rw-r--r--diff-lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c
index 87a2591..c50f7e3 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -71,7 +71,7 @@ static int match_stat_with_submodule(struct diff_options *diffopt,
if (S_ISGITLINK(ce->ce_mode)
&& !DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES)
&& (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES))) {
- *dirty_submodule = is_submodule_modified(ce->name);
+ *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES));
}
return changed;
}