summaryrefslogtreecommitdiff
path: root/builtin/diff-index.c
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2010-08-06 00:40:48 +0200
committerJunio C Hamano <gitster@pobox.com>2010-08-09 09:11:44 -0700
commit302ad7a9930a34413418b6436f96826070367647 (patch)
tree5cd126308137179d75632405e3c084950d8c4e34 /builtin/diff-index.c
parentaee9c7d6540fe6f66fbbe7be420caa26ae0fa2d9 (diff)
downloadgit-302ad7a9930a34413418b6436f96826070367647.tar.gz
Submodules: Use "ignore" settings from .gitmodules too for diff and status
The .gitmodules file is parsed for "submodule.<name>.ignore" entries before looking for them in .git/config. Thus settings found in .git/config will override those from .gitmodules, thereby allowing the local developer to ignore settings given by the remote side while also letting upstream set defaults for those users who don't have special needs. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff-index.c')
-rw-r--r--builtin/diff-index.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 04837494fe..2eb32bd9da 100644
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -3,6 +3,7 @@
#include "commit.h"
#include "revision.h"
#include "builtin.h"
+#include "submodule.h"
static const char diff_cache_usage[] =
"git diff-index [-m] [--cached] "
@@ -17,6 +18,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
int result;
init_revisions(&rev, prefix);
+ gitmodules_config();
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
rev.abbrev = 0;