summaryrefslogtreecommitdiff
path: root/builtin-add.c
diff options
context:
space:
mode:
authorJames Bowes <jbowes@dangerouslyinc.com>2007-02-28 03:31:10 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-09 08:06:00 (GMT)
commit896bdfa2581f96d3df9a312510c39ce7d80790cd (patch)
treeb6572edd6bc7f7ecf55e3c3cde9fb3d975e95e02 /builtin-add.c
parentbd1fc628b8d456bdaea3e10d435cf1e98bc5d8a8 (diff)
downloadgit-896bdfa2581f96d3df9a312510c39ce7d80790cd.zip
git-896bdfa2581f96d3df9a312510c39ce7d80790cd.tar.gz
git-896bdfa2581f96d3df9a312510c39ce7d80790cd.tar.bz2
add: Support specifying an excludes file with a configuration variable
This adds the 'core.excludesfile' configuration variable. This variable can hold a path to a file containing patterns of file names to exclude from git-add, like $GIT_DIR/info/exclude. Patterns in the excludes file are used in addition to those in info/exclude. Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-add.c')
-rw-r--r--builtin-add.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/builtin-add.c b/builtin-add.c
index 87e16aa..9fcf514 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -12,6 +12,8 @@
static const char builtin_add_usage[] =
"git-add [-n] [-v] [-f] [--interactive | -i] [--] <filepattern>...";
+static const char *excludes_file;
+
static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
{
char *seen;
@@ -67,6 +69,8 @@ static void fill_directory(struct dir_struct *dir, const char **pathspec)
path = git_path("info/exclude");
if (!access(path, R_OK))
add_excludes_from_file(dir, path);
+ if (!access(excludes_file, R_OK))
+ add_excludes_from_file(dir, excludes_file);
/*
* Calculate common prefix for the pathspec, and
@@ -88,6 +92,18 @@ static void fill_directory(struct dir_struct *dir, const char **pathspec)
prune_directory(dir, pathspec, baselen);
}
+static int git_add_config(const char *var, const char *value)
+{
+ if (!strcmp(var, "core.excludesfile")) {
+ if (!value)
+ die("core.excludesfile without value");
+ excludes_file = xstrdup(value);
+ return 0;
+ }
+
+ return git_default_config(var, value);
+}
+
static struct lock_file lock_file;
static const char ignore_warning[] =
@@ -115,7 +131,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
exit(1);
}
- git_config(git_default_config);
+ git_config(git_add_config);
newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);