From: Heiko Voigt <hvoigt@hvoigt.net>
To: Sergey Sharybin <sergey.vfx@gmail.com>
Cc: Jens Lehmann <Jens.Lehmann@web.de>,
Jonathan Nieder <jrnieder@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Jeff King <peff@peff.net>, Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: [RFC/WIP PATCH 2/4] fix 'git add' to skip submodules configured as ignored
Date: Wed, 4 Dec 2013 23:21:05 +0100 [thread overview]
Message-ID: <20131204222105.GC7326@sandbox-ub> (raw)
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
next prev parent reply other threads:[~2013-12-04 22:21 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-22 7:53 Git issues with submodules Sergey Sharybin
2013-11-22 11:16 ` Ramkumar Ramachandra
2013-11-22 11:35 ` Sergey Sharybin
2013-11-22 13:08 ` Ramkumar Ramachandra
2013-11-22 15:11 ` Jeff King
2013-11-22 15:42 ` Sergey Sharybin
2013-11-22 16:35 ` Ramkumar Ramachandra
2013-11-22 17:01 ` Sergey Sharybin
2013-11-22 17:40 ` Sergey Sharybin
2013-11-22 18:11 ` Ramkumar Ramachandra
2013-11-22 21:01 ` Jens Lehmann
2013-11-22 21:46 ` Sergey Sharybin
2013-11-22 21:54 ` Heiko Voigt
2013-11-22 22:09 ` Jonathan Nieder
2013-11-23 20:10 ` Jens Lehmann
2013-11-24 0:52 ` Heiko Voigt
2013-11-24 16:29 ` Jens Lehmann
2013-11-25 9:02 ` Sergey Sharybin
2013-11-25 17:49 ` Heiko Voigt
2013-11-25 17:57 ` Sergey Sharybin
2013-11-25 18:15 ` Heiko Voigt
2013-12-04 22:16 ` [RFC/WIP PATCH 0/4] less ignorance of submodules for ignore=all Heiko Voigt
2013-12-04 22:19 ` [RFC/WIP PATCH 1/4] disable complete ignorance of submodules for index <-> HEAD diff Heiko Voigt
2013-12-04 22:21 ` Heiko Voigt [this message]
2013-12-04 22:21 ` [RFC/WIP PATCH 3/4] teach add -f option for ignored submodules Heiko Voigt
2013-12-06 23:10 ` Junio C Hamano
2013-12-09 21:51 ` Heiko Voigt
2013-12-04 22:23 ` [RFC/WIP PATCH 4/4] always show committed submodules in summary after commit Heiko Voigt
2013-12-04 22:26 ` [RFC/WIP PATCH 0/4] less ignorance of submodules for ignore=all Heiko Voigt
2013-12-04 22:32 ` Junio C Hamano
2013-12-04 23:19 ` Heiko Voigt
2013-12-05 20:51 ` Jens Lehmann
2013-12-09 21:41 ` Heiko Voigt
2013-12-09 22:25 ` Junio C Hamano
2013-11-25 21:01 ` Git issues with submodules Junio C Hamano
2013-11-26 18:44 ` Jens Lehmann
2013-11-26 19:33 ` Junio C Hamano
2013-11-26 19:51 ` Jonathan Nieder
2013-11-26 22:19 ` Junio C Hamano
2013-11-23 1:11 ` [RFC PATCH] disable complete ignorance of submodules for index <-> HEAD diff Heiko Voigt
2013-11-25 9:01 ` Sergey Sharybin
2013-11-28 7:10 ` Heiko Voigt
2013-11-29 23:11 ` [RFC/WIP PATCH v2] " Heiko Voigt
2013-11-23 7:04 ` Re: Git issues with submodules Ramkumar Ramachandra
2013-11-23 20:32 ` Jens Lehmann
2013-11-24 1:06 ` Heiko Voigt
2013-11-25 20:53 ` Junio C Hamano
2013-11-29 22:50 ` Heiko Voigt
2013-11-23 6:53 ` Ramkumar Ramachandra
2013-11-22 16:12 ` Ramkumar Ramachandra
2013-11-22 20:20 ` Jens Lehmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131204222105.GC7326@sandbox-ub \
--to=hvoigt@hvoigt.net \
--cc=Jens.Lehmann@web.de \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=sergey.vfx@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).