[RFC/WIP PATCH 2/4] fix 'git add' to skip submodules configured as ignored
- From
Heiko Voigt <hvoigt@hvoigt.net>
- Date
- Dec 4, 2013, 22:21 UTC
- Message-ID
- <20131204222105.GC7326@sandbox-ub>
- In-Reply-To
- <20131204221659.GA7326@sandbox-ub>
If submodules are configured as ignore=all they are not shown by status. Lets also ignore them when adding files to the index. This avoids that users accidentially add ignored submodules with: git add .
We achieve this by reading the submodule config and thus correctly initializing the infrastructure to take the ignore decision.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> --- builtin/add.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/builtin/add.c b/builtin/add.c index 226f758..2d0d2ef 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -15,6 +15,7 @@ #include "diffcore.h" #include "revision.h" #include "bulk-checkin.h" +#include "submodule.h" static const char * const builtin_add_usage[] = { N_("git add [options] [--] <pathspec>..."), @@ -378,6 +379,10 @@ static int add_config(const char *var, const char *value, void *cb) ignore_add_errors = git_config_bool(var, value); return 0; } + + if (!prefixcmp(var, "submodule.")) + return parse_submodule_config_option(var, value); + return git_default_config(var, value, cb); } @@ -415,6 +420,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) int implicit_dot = 0; struct update_callback_data update_data; + gitmodules_config(); git_config(add_config, NULL); argc = parse_options(argc, argv, prefix, builtin_add_options,
-- 1.8.5.1.43.gf00fb86