2 * "git add" builtin command
4 * Copyright (C) 2006 Linus Torvalds
10 #include "cache-tree.h"
16 static const char builtin_add_usage[] =
17 "git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--] <filepattern>...";
19 static int take_worktree_changes;
20 static const char *excludes_file;
22 static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
26 struct dir_entry **src, **dst;
28 for (specs = 0; pathspec[specs]; specs++)
30 seen = xcalloc(specs, 1);
32 src = dst = dir->entries;
35 struct dir_entry *entry = *src++;
36 if (match_pathspec(pathspec, entry->name, entry->len,
40 dir->nr = dst - dir->entries;
42 for (i = 0; i < specs; i++) {
43 if (!seen[i] && !file_exists(pathspec[i]))
44 die("pathspec '%s' did not match any files",
49 static void fill_directory(struct dir_struct *dir, const char **pathspec,
52 const char *path, *base;
55 /* Set up the default git porcelain excludes */
56 memset(dir, 0, sizeof(*dir));
58 dir->collect_ignored = 1;
59 dir->exclude_per_dir = ".gitignore";
60 path = git_path("info/exclude");
61 if (!access(path, R_OK))
62 add_excludes_from_file(dir, path);
63 if (excludes_file != NULL && !access(excludes_file, R_OK))
64 add_excludes_from_file(dir, excludes_file);
68 * Calculate common prefix for the pathspec, and
69 * use that to optimize the directory walk
71 baselen = common_prefix(pathspec);
75 char *common = xmalloc(baselen + 1);
76 memcpy(common, *pathspec, baselen);
81 /* Read the directory and prune it */
82 read_directory(dir, path, base, baselen, pathspec);
84 prune_directory(dir, pathspec, baselen);
87 static void update_callback(struct diff_queue_struct *q,
88 struct diff_options *opt, void *cbdata)
92 verbose = *((int *)cbdata);
93 for (i = 0; i < q->nr; i++) {
94 struct diff_filepair *p = q->queue[i];
95 const char *path = p->one->path;
98 die("unexpacted diff status %c", p->status);
99 case DIFF_STATUS_UNMERGED:
100 case DIFF_STATUS_MODIFIED:
101 add_file_to_cache(path, verbose);
103 case DIFF_STATUS_DELETED:
104 remove_file_from_cache(path);
106 printf("remove '%s'\n", path);
112 static void update(int verbose, const char **files)
115 init_revisions(&rev, "");
116 setup_revisions(0, NULL, &rev, NULL);
117 rev.prune_data = get_pathspec(rev.prefix, files);
118 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
119 rev.diffopt.format_callback = update_callback;
120 rev.diffopt.format_callback_data = &verbose;
121 if (read_cache() < 0)
122 die("index file corrupt");
123 run_diff_files(&rev, 0);
126 static void refresh(int verbose, const char **pathspec)
131 for (specs = 0; pathspec[specs]; specs++)
133 seen = xcalloc(specs, 1);
134 if (read_cache() < 0)
135 die("index file corrupt");
136 refresh_index(&the_index, verbose ? 0 : REFRESH_QUIET, pathspec, seen);
137 for (i = 0; i < specs; i++) {
139 die("pathspec '%s' did not match any files", pathspec[i]);
143 static int git_add_config(const char *var, const char *value)
145 if (!strcmp(var, "core.excludesfile")) {
147 die("core.excludesfile without value");
148 excludes_file = xstrdup(value);
152 return git_default_config(var, value);
155 static struct lock_file lock_file;
157 static const char ignore_warning[] =
158 "The following paths are ignored by one of your .gitignore files:\n";
160 int cmd_add(int argc, const char **argv, const char *prefix)
163 int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
164 const char **pathspec;
165 struct dir_struct dir;
166 int add_interactive = 0;
168 for (i = 1; i < argc; i++) {
169 if (!strcmp("--interactive", argv[i]) ||
170 !strcmp("-i", argv[i]))
173 if (add_interactive) {
174 const char *args[] = { "add--interactive", NULL };
176 if (add_interactive != 1 || argc != 2)
177 die("add --interactive does not take any parameters");
182 git_config(git_add_config);
184 newfd = hold_locked_index(&lock_file, 1);
186 for (i = 1; i < argc; i++) {
187 const char *arg = argv[i];
191 if (!strcmp(arg, "--")) {
195 if (!strcmp(arg, "-n")) {
199 if (!strcmp(arg, "-f")) {
203 if (!strcmp(arg, "-v")) {
207 if (!strcmp(arg, "-u")) {
208 take_worktree_changes = 1;
211 if (!strcmp(arg, "--refresh")) {
215 usage(builtin_add_usage);
218 if (take_worktree_changes) {
219 update(verbose, argv + i);
224 fprintf(stderr, "Nothing specified, nothing added.\n");
225 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
228 pathspec = get_pathspec(prefix, argv + i);
231 refresh(verbose, pathspec);
235 fill_directory(&dir, pathspec, ignored_too);
238 const char *sep = "", *eof = "";
239 for (i = 0; i < dir.nr; i++) {
240 printf("%s%s", sep, dir.entries[i]->name);
248 if (read_cache() < 0)
249 die("index file corrupt");
251 if (dir.ignored_nr) {
252 fprintf(stderr, ignore_warning);
253 for (i = 0; i < dir.ignored_nr; i++) {
254 fprintf(stderr, "%s\n", dir.ignored[i]->name);
256 fprintf(stderr, "Use -f if you really want to add them.\n");
260 for (i = 0; i < dir.nr; i++)
261 add_file_to_cache(dir.entries[i]->name, verbose);
264 if (active_cache_changed) {
265 if (write_cache(newfd, active_cache, active_nr) ||
266 close(newfd) || commit_locked_index(&lock_file))
267 die("Unable to write new index file");