diff options
| author | Heiko Voigt <hvoigt@hvoigt.net> | 2013-12-04 23:19:59 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-06 12:56:12 -0800 |
| commit | 5f3eb7674082a52dea6c6252752509b05a3bfe0a (patch) | |
| tree | ec0f2b95958699a94a2375f8c9c5493ea6d09260 /builtin/diff.c | |
| parent | 8ea31d279681533c0b4c8eb1d61b18e95da55df0 (diff) | |
| download | git-hv/submodule-ignore-fix.tar.gz | |
disable complete ignorance of submodules for index <-> HEAD diffhv/submodule-ignore-fix
If the value of ignore for submodules is set to "all" we would not show
whats actually committed during status or diff. This can result in the
user committing unexpected submodule references. Lets be nicer and always
show whats in the index.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index adb93a9efa..c47614d7c2 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -162,6 +162,8 @@ static int builtin_diff_tree(struct rev_info *revs, if (argc > 1) usage(builtin_diff_usage); + enforce_no_complete_ignore_submodule(&revs->diffopt); + /* * We saw two trees, ent0 and ent1. If ent1 is uninteresting, * swap them. |