2 * "git add" builtin command
4 * Copyright (C) 2006 Linus Torvalds
10 #include "cache-tree.h"
15 #include "run-command.h"
16 #include "parse-options.h"
18 static const char * const builtin_add_usage[] = {
19 "git-add [options] [--] <filepattern>...",
22 static int patch_interactive = 0, add_interactive = 0;
23 static int take_worktree_changes;
25 static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
29 struct dir_entry **src, **dst;
31 for (specs = 0; pathspec[specs]; specs++)
33 seen = xcalloc(specs, 1);
35 src = dst = dir->entries;
38 struct dir_entry *entry = *src++;
39 if (match_pathspec(pathspec, entry->name, entry->len,
43 dir->nr = dst - dir->entries;
45 for (i = 0; i < specs; i++) {
46 if (!seen[i] && !file_exists(pathspec[i]))
47 die("pathspec '%s' did not match any files",
53 static void fill_directory(struct dir_struct *dir, const char **pathspec,
56 const char *path, *base;
59 /* Set up the default git porcelain excludes */
60 memset(dir, 0, sizeof(*dir));
62 dir->collect_ignored = 1;
63 setup_standard_excludes(dir);
67 * Calculate common prefix for the pathspec, and
68 * use that to optimize the directory walk
70 baselen = common_prefix(pathspec);
74 path = base = xmemdupz(*pathspec, baselen);
76 /* Read the directory and prune it */
77 read_directory(dir, path, base, baselen, pathspec);
79 prune_directory(dir, pathspec, baselen);
82 struct update_callback_data
88 static void update_callback(struct diff_queue_struct *q,
89 struct diff_options *opt, void *cbdata)
92 struct update_callback_data *data = cbdata;
94 for (i = 0; i < q->nr; i++) {
95 struct diff_filepair *p = q->queue[i];
96 const char *path = p->one->path;
99 die("unexpected diff status %c", p->status);
100 case DIFF_STATUS_UNMERGED:
101 case DIFF_STATUS_MODIFIED:
102 case DIFF_STATUS_TYPE_CHANGED:
103 if (add_file_to_cache(path, data->flags & ADD_FILES_VERBOSE)) {
104 if (!(data->flags & ADD_FILES_IGNORE_ERRORS))
105 die("updating files failed");
109 case DIFF_STATUS_DELETED:
110 remove_file_from_cache(path);
111 if (data->flags & ADD_FILES_VERBOSE)
112 printf("remove '%s'\n", path);
118 int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
120 struct update_callback_data data;
122 init_revisions(&rev, prefix);
123 setup_revisions(0, NULL, &rev, NULL);
124 rev.prune_data = pathspec;
125 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
126 rev.diffopt.format_callback = update_callback;
129 rev.diffopt.format_callback_data = &data;
130 run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
131 return !!data.add_errors;
134 static void refresh(int verbose, const char **pathspec)
139 for (specs = 0; pathspec[specs]; specs++)
141 seen = xcalloc(specs, 1);
142 if (read_cache() < 0)
143 die("index file corrupt");
144 refresh_index(&the_index, verbose ? 0 : REFRESH_QUIET, pathspec, seen);
145 for (i = 0; i < specs; i++) {
147 die("pathspec '%s' did not match any files", pathspec[i]);
152 static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
154 const char **pathspec = get_pathspec(prefix, argv);
159 int interactive_add(int argc, const char **argv, const char *prefix)
163 const char **pathspec = NULL;
166 pathspec = validate_pathspec(argc, argv, prefix);
171 args = xcalloc(sizeof(const char *), (argc + 4));
173 args[ac++] = "add--interactive";
174 if (patch_interactive)
175 args[ac++] = "--patch";
178 memcpy(&(args[ac]), pathspec, sizeof(const char *) * argc);
183 status = run_command_v_opt(args, RUN_GIT_CMD);
188 static struct lock_file lock_file;
190 static const char ignore_error[] =
191 "The following paths are ignored by one of your .gitignore files:\n";
193 static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
194 static int ignore_add_errors;
196 static struct option builtin_add_options[] = {
197 OPT__DRY_RUN(&show_only),
198 OPT__VERBOSE(&verbose),
200 OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
201 OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
202 OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"),
203 OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"),
204 OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
205 OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
209 int cmd_add(int argc, const char **argv, const char *prefix)
213 const char **pathspec;
214 struct dir_struct dir;
216 argc = parse_options(argc, argv, builtin_add_options,
217 builtin_add_usage, 0);
218 if (patch_interactive)
221 exit(interactive_add(argc, argv, prefix));
223 git_config(git_default_config);
225 newfd = hold_locked_index(&lock_file, 1);
227 if (take_worktree_changes) {
229 const char **pathspec;
230 if (read_cache() < 0)
231 die("index file corrupt");
232 pathspec = get_pathspec(prefix, argv);
235 flags |= ADD_FILES_VERBOSE;
236 if (ignore_add_errors)
237 flags |= ADD_FILES_IGNORE_ERRORS;
239 exit_status = add_files_to_cache(prefix, pathspec, flags);
244 fprintf(stderr, "Nothing specified, nothing added.\n");
245 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
248 pathspec = get_pathspec(prefix, argv);
251 refresh(verbose, pathspec);
255 fill_directory(&dir, pathspec, ignored_too);
258 const char *sep = "", *eof = "";
259 for (i = 0; i < dir.nr; i++) {
260 printf("%s%s", sep, dir.entries[i]->name);
268 if (read_cache() < 0)
269 die("index file corrupt");
271 if (dir.ignored_nr) {
272 fprintf(stderr, ignore_error);
273 for (i = 0; i < dir.ignored_nr; i++) {
274 fprintf(stderr, "%s\n", dir.ignored[i]->name);
276 fprintf(stderr, "Use -f if you really want to add them.\n");
277 die("no files added");
280 for (i = 0; i < dir.nr; i++)
281 if (add_file_to_cache(dir.entries[i]->name, verbose)) {
282 if (!ignore_add_errors)
283 die("adding files failed");
288 if (active_cache_changed) {
289 if (write_cache(newfd, active_cache, active_nr) ||
290 commit_locked_index(&lock_file))
291 die("Unable to write new index file");