*
* Copyright (C) 2006 Linus Torvalds
*/
-#include <fnmatch.h>
-
#include "cache.h"
#include "builtin.h"
#include "dir.h"
+#include "exec_cmd.h"
#include "cache-tree.h"
static const char builtin_add_usage[] =
-"git-add [-n] [-v] <filepattern>...";
-
-static int common_prefix(const char **pathspec)
-{
- const char *path, *slash, *next;
- int prefix;
-
- if (!pathspec)
- return 0;
-
- path = *pathspec;
- slash = strrchr(path, '/');
- if (!slash)
- return 0;
-
- prefix = slash - path + 1;
- while ((next = *++pathspec) != NULL) {
- int len = strlen(next);
- if (len >= prefix && !memcmp(path, next, len))
- continue;
- for (;;) {
- if (!len)
- return 0;
- if (next[--len] != '/')
- continue;
- if (memcmp(path, next, len+1))
- continue;
- prefix = len + 1;
- break;
- }
- }
- return prefix;
-}
-
-static int match_one(const char *match, const char *name, int namelen)
-{
- int matchlen;
-
- /* If the match was just the prefix, we matched */
- matchlen = strlen(match);
- if (!matchlen)
- return 1;
-
- /*
- * If we don't match the matchstring exactly,
- * we need to match by fnmatch
- */
- if (strncmp(match, name, matchlen))
- return !fnmatch(match, name, 0);
-
- /*
- * If we did match the string exactly, we still
- * need to make sure that it happened on a path
- * component boundary (ie either the last character
- * of the match was '/', or the next character of
- * the name was '/' or the terminating NUL.
- */
- return match[matchlen-1] == '/' ||
- name[matchlen] == '/' ||
- !name[matchlen];
-}
-
-static int match(const char **pathspec, const char *name, int namelen, int prefix, char *seen)
-{
- int retval;
- const char *match;
-
- name += prefix;
- namelen -= prefix;
-
- for (retval = 0; (match = *pathspec++) != NULL; seen++) {
- if (retval & *seen)
- continue;
- match += prefix;
- if (match_one(match, name, namelen)) {
- retval = 1;
- *seen = 1;
- }
- }
- return retval;
-}
+"git-add [-n] [-v] [-f] [--interactive | -i] [--] <filepattern>...";
static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
{
for (specs = 0; pathspec[specs]; specs++)
/* nothing */;
- seen = xmalloc(specs);
- memset(seen, 0, specs);
+ seen = xcalloc(specs, 1);
src = dst = dir->entries;
i = dir->nr;
while (--i >= 0) {
struct dir_entry *entry = *src++;
- if (!match(pathspec, entry->name, entry->len, prefix, seen)) {
- free(entry);
- continue;
- }
- *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 (!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);
}
}
base = "";
if (baselen) {
char *common = xmalloc(baselen + 1);
- common = xmalloc(baselen + 1);
memcpy(common, *pathspec, baselen);
common[baselen] = 0;
path = base = common;
prune_directory(dir, pathspec, baselen);
}
-static int add_file_to_index(const char *path, int verbose)
-{
- int size, namelen;
- struct stat st;
- struct cache_entry *ce;
-
- if (lstat(path, &st))
- die("%s: unable to stat (%s)", path, strerror(errno));
-
- if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode))
- die("%s: can only add regular files or symbolic links", path);
+static struct lock_file lock_file;
- namelen = strlen(path);
- size = cache_entry_size(namelen);
- ce = xcalloc(1, size);
- memcpy(ce->name, path, namelen);
- ce->ce_flags = htons(namelen);
- fill_stat_cache_info(ce, &st);
+static const char ignore_warning[] =
+"The following paths are ignored by one of your .gitignore files:\n";
- ce->ce_mode = create_ce_mode(st.st_mode);
- if (!trust_executable_bit) {
- /* If there is an existing entry, pick the mode bits
- * from it.
- */
- int pos = cache_name_pos(path, namelen);
- if (pos >= 0)
- ce->ce_mode = active_cache[pos]->ce_mode;
- }
-
- if (index_path(ce->sha1, path, &st, 1))
- die("unable to index file %s", path);
- if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD))
- die("unable to add %s to index",path);
- if (verbose)
- printf("add '%s'\n", path);
- cache_tree_invalidate_path(active_cache_tree, path);
- return 0;
-}
-
-static struct cache_file cache_file;
-
-int cmd_add(int argc, const char **argv, char **envp)
+int cmd_add(int argc, const char **argv, const char *prefix)
{
int i, newfd;
- int verbose = 0, show_only = 0;
- const char *prefix = setup_git_directory();
+ int verbose = 0, show_only = 0, ignored_too = 0;
const char **pathspec;
struct dir_struct dir;
+ int add_interactive = 0;
- git_config(git_default_config);
+ for (i = 1; i < argc; i++) {
+ if (!strcmp("--interactive", argv[i]) ||
+ !strcmp("-i", argv[i]))
+ add_interactive++;
+ }
+ if (add_interactive) {
+ const char *args[] = { "add--interactive", NULL };
- newfd = hold_index_file_for_update(&cache_file, get_index_file());
- if (newfd < 0)
- die("unable to create new cachefile");
+ if (add_interactive != 1 || argc != 2)
+ die("add --interactive does not take any parameters");
+ execv_git_cmd(args);
+ exit(1);
+ }
- if (read_cache() < 0)
- die("index file corrupt");
+ git_config(git_default_config);
+
+ newfd = hold_lock_file_for_update(&lock_file, get_index_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;
}
- die(builtin_add_usage);
+ usage(builtin_add_usage);
+ }
+ if (argc <= i) {
+ fprintf(stderr, "Nothing specified, nothing added.\n");
+ fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
+ return 0;
}
- git_config(git_default_config);
pathspec = get_pathspec(prefix, argv + i);
fill_directory(&dir, pathspec);
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";
return 0;
}
+ 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);
if (active_cache_changed) {
if (write_cache(newfd, active_cache, active_nr) ||
- commit_index_file(&cache_file))
+ close(newfd) || commit_lock_file(&lock_file))
die("Unable to write new index file");
}