#include "cache-tree.h"
static const char builtin_add_usage[] =
-"git-add [-n] [-v] [--interactive] [--] <filepattern>...";
+"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)
{
i = dir->nr;
while (--i >= 0) {
struct dir_entry *entry = *src++;
- int how = match_pathspec(pathspec, entry->name, entry->len,
- prefix, seen);
- /*
- * ignored entries can be added with exact match,
- * but not with glob nor recursive.
- */
- if (!how ||
- (entry->ignored_entry && how != MATCHED_EXACTLY)) {
- free(entry);
- continue;
- }
- if (entry->ignored_entry)
- fprintf(stderr, "warning: '%s' is an ignored path.\n",
- entry->name);
- *dst++ = entry;
+ if (match_pathspec(pathspec, entry->name, entry->len,
+ prefix, seen))
+ *dst++ = entry;
}
dir->nr = dst - dir->entries;
if (seen[i])
continue;
- /* Existing file? We must have ignored it */
match = pathspec[i];
- if (!match[0] || !lstat(match, &st))
+ if (!match[0])
continue;
+
+ /* Existing file? We must have ignored it */
+ if (!lstat(match, &st)) {
+ struct dir_entry *ent;
+
+ ent = dir_add_name(dir, match, strlen(match));
+ ent->ignored = 1;
+ if (S_ISDIR(st.st_mode))
+ ent->ignored_dir = 1;
+ continue;
+ }
die("pathspec '%s' did not match any files", match);
}
}
/* Set up the default git porcelain excludes */
memset(dir, 0, sizeof(*dir));
- if (pathspec)
- dir->show_both = 1;
dir->exclude_per_dir = ".gitignore";
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
}
/* Read the directory and prune it */
- read_directory(dir, path, base, baselen);
+ read_directory(dir, path, base, baselen, pathspec);
if (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[] =
+"The following paths are ignored by one of your .gitignore files:\n";
+
int cmd_add(int argc, const char **argv, const char *prefix)
{
int i, newfd;
- int verbose = 0, show_only = 0;
+ int verbose = 0, show_only = 0, ignored_too = 0;
const char **pathspec;
struct dir_struct dir;
int add_interactive = 0;
for (i = 1; i < argc; i++) {
- if (!strcmp("--interactive", argv[i]))
+ if (!strcmp("--interactive", argv[i]) ||
+ !strcmp("-i", argv[i]))
add_interactive++;
}
if (add_interactive) {
exit(1);
}
- git_config(git_default_config);
+ git_config(git_add_config);
- newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
+ newfd = hold_locked_index(&lock_file, 1);
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
show_only = 1;
continue;
}
+ if (!strcmp(arg, "-f")) {
+ ignored_too = 1;
+ continue;
+ }
if (!strcmp(arg, "-v")) {
verbose = 1;
continue;
if (show_only) {
const char *sep = "", *eof = "";
for (i = 0; i < dir.nr; i++) {
+ if (!ignored_too && dir.entries[i]->ignored)
+ continue;
printf("%s%s", sep, dir.entries[i]->name);
sep = " ";
eof = "\n";
if (read_cache() < 0)
die("index file corrupt");
+ if (!ignored_too) {
+ int has_ignored = 0;
+ for (i = 0; i < dir.nr; i++)
+ if (dir.entries[i]->ignored)
+ has_ignored = 1;
+ if (has_ignored) {
+ fprintf(stderr, ignore_warning);
+ for (i = 0; i < dir.nr; i++) {
+ if (!dir.entries[i]->ignored)
+ continue;
+ fprintf(stderr, "%s", dir.entries[i]->name);
+ if (dir.entries[i]->ignored_dir)
+ fprintf(stderr, " (directory)");
+ fputc('\n', stderr);
+ }
+ fprintf(stderr,
+ "Use -f if you really want to add them.\n");
+ exit(1);
+ }
+ }
+
for (i = 0; i < dir.nr; i++)
- add_file_to_index(dir.entries[i]->name, verbose);
+ add_file_to_cache(dir.entries[i]->name, verbose);
if (active_cache_changed) {
if (write_cache(newfd, active_cache, active_nr) ||
- close(newfd) || commit_lock_file(&lock_file))
+ close(newfd) || commit_locked_index(&lock_file))
die("Unable to write new index file");
}