diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:37 -0700 |
| commit | e1165dd1442017c2b2722027168c497640f25746 (patch) | |
| tree | 6b1d95aa8cd3a213bfee6eee59de308da028068a /diff-lib.c | |
| parent | c9eaaab4165d8f402930d12899ec097495b599e6 (diff) | |
| parent | 6ed7ddaadba9217b794aecf6d74a2e455daf7a96 (diff) | |
| download | git-e1165dd1442017c2b2722027168c497640f25746.tar.gz | |
Merge branch 'jl/maint-diff-ignore-submodules'
* jl/maint-diff-ignore-submodules:
t4027,4041: Use test -s to test for an empty file
Add optional parameters to the diff option "--ignore-submodules"
git diff: rename test that had a conflicting name
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/diff-lib.c b/diff-lib.c index c9f6e05bad..8b8978ae6d 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)); } |