Merge branch 'maint'
[git/jrn.git] / builtin-add.c
blob87e16aa2200f90e2f12673e856040ed29ee7d119
1 /*
2 * "git add" builtin command
4 * Copyright (C) 2006 Linus Torvalds
5 */
6 #include "cache.h"
7 #include "builtin.h"
8 #include "dir.h"
9 #include "exec_cmd.h"
10 #include "cache-tree.h"
12 static const char builtin_add_usage[] =
13 "git-add [-n] [-v] [-f] [--interactive | -i] [--] <filepattern>...";
15 static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
17 char *seen;
18 int i, specs;
19 struct dir_entry **src, **dst;
21 for (specs = 0; pathspec[specs]; specs++)
22 /* nothing */;
23 seen = xcalloc(specs, 1);
25 src = dst = dir->entries;
26 i = dir->nr;
27 while (--i >= 0) {
28 struct dir_entry *entry = *src++;
29 if (match_pathspec(pathspec, entry->name, entry->len,
30 prefix, seen))
31 *dst++ = entry;
33 dir->nr = dst - dir->entries;
35 for (i = 0; i < specs; i++) {
36 struct stat st;
37 const char *match;
38 if (seen[i])
39 continue;
41 match = pathspec[i];
42 if (!match[0])
43 continue;
45 /* Existing file? We must have ignored it */
46 if (!lstat(match, &st)) {
47 struct dir_entry *ent;
49 ent = dir_add_name(dir, match, strlen(match));
50 ent->ignored = 1;
51 if (S_ISDIR(st.st_mode))
52 ent->ignored_dir = 1;
53 continue;
55 die("pathspec '%s' did not match any files", match);
59 static void fill_directory(struct dir_struct *dir, const char **pathspec)
61 const char *path, *base;
62 int baselen;
64 /* Set up the default git porcelain excludes */
65 memset(dir, 0, sizeof(*dir));
66 dir->exclude_per_dir = ".gitignore";
67 path = git_path("info/exclude");
68 if (!access(path, R_OK))
69 add_excludes_from_file(dir, path);
72 * Calculate common prefix for the pathspec, and
73 * use that to optimize the directory walk
75 baselen = common_prefix(pathspec);
76 path = ".";
77 base = "";
78 if (baselen) {
79 char *common = xmalloc(baselen + 1);
80 memcpy(common, *pathspec, baselen);
81 common[baselen] = 0;
82 path = base = common;
85 /* Read the directory and prune it */
86 read_directory(dir, path, base, baselen);
87 if (pathspec)
88 prune_directory(dir, pathspec, baselen);
91 static struct lock_file lock_file;
93 static const char ignore_warning[] =
94 "The following paths are ignored by one of your .gitignore files:\n";
96 int cmd_add(int argc, const char **argv, const char *prefix)
98 int i, newfd;
99 int verbose = 0, show_only = 0, ignored_too = 0;
100 const char **pathspec;
101 struct dir_struct dir;
102 int add_interactive = 0;
104 for (i = 1; i < argc; i++) {
105 if (!strcmp("--interactive", argv[i]) ||
106 !strcmp("-i", argv[i]))
107 add_interactive++;
109 if (add_interactive) {
110 const char *args[] = { "add--interactive", NULL };
112 if (add_interactive != 1 || argc != 2)
113 die("add --interactive does not take any parameters");
114 execv_git_cmd(args);
115 exit(1);
118 git_config(git_default_config);
120 newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
122 for (i = 1; i < argc; i++) {
123 const char *arg = argv[i];
125 if (arg[0] != '-')
126 break;
127 if (!strcmp(arg, "--")) {
128 i++;
129 break;
131 if (!strcmp(arg, "-n")) {
132 show_only = 1;
133 continue;
135 if (!strcmp(arg, "-f")) {
136 ignored_too = 1;
137 continue;
139 if (!strcmp(arg, "-v")) {
140 verbose = 1;
141 continue;
143 usage(builtin_add_usage);
145 if (argc <= i) {
146 fprintf(stderr, "Nothing specified, nothing added.\n");
147 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
148 return 0;
150 pathspec = get_pathspec(prefix, argv + i);
152 fill_directory(&dir, pathspec);
154 if (show_only) {
155 const char *sep = "", *eof = "";
156 for (i = 0; i < dir.nr; i++) {
157 if (!ignored_too && dir.entries[i]->ignored)
158 continue;
159 printf("%s%s", sep, dir.entries[i]->name);
160 sep = " ";
161 eof = "\n";
163 fputs(eof, stdout);
164 return 0;
167 if (read_cache() < 0)
168 die("index file corrupt");
170 if (!ignored_too) {
171 int has_ignored = 0;
172 for (i = 0; i < dir.nr; i++)
173 if (dir.entries[i]->ignored)
174 has_ignored = 1;
175 if (has_ignored) {
176 fprintf(stderr, ignore_warning);
177 for (i = 0; i < dir.nr; i++) {
178 if (!dir.entries[i]->ignored)
179 continue;
180 fprintf(stderr, "%s", dir.entries[i]->name);
181 if (dir.entries[i]->ignored_dir)
182 fprintf(stderr, " (directory)");
183 fputc('\n', stderr);
185 fprintf(stderr,
186 "Use -f if you really want to add them.\n");
187 exit(1);
191 for (i = 0; i < dir.nr; i++)
192 add_file_to_index(dir.entries[i]->name, verbose);
194 if (active_cache_changed) {
195 if (write_cache(newfd, active_cache, active_nr) ||
196 close(newfd) || commit_lock_file(&lock_file))
197 die("Unable to write new index file");
200 return 0;