reset: add option "--keep" to "git reset"
[git/dscho.git] / builtin-add.c
blob2705f8d057a93f7b4a9351713b89fd9f4e041815
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"
11 #include "run-command.h"
12 #include "parse-options.h"
13 #include "diff.h"
14 #include "diffcore.h"
15 #include "revision.h"
17 static const char * const builtin_add_usage[] = {
18 "git add [options] [--] <filepattern>...",
19 NULL
21 static int patch_interactive, add_interactive, edit_interactive;
22 static int take_worktree_changes;
24 struct update_callback_data
26 int flags;
27 int add_errors;
30 static void update_callback(struct diff_queue_struct *q,
31 struct diff_options *opt, void *cbdata)
33 int i;
34 struct update_callback_data *data = cbdata;
36 for (i = 0; i < q->nr; i++) {
37 struct diff_filepair *p = q->queue[i];
38 const char *path = p->one->path;
39 switch (p->status) {
40 default:
41 die("unexpected diff status %c", p->status);
42 case DIFF_STATUS_UNMERGED:
44 * ADD_CACHE_IGNORE_REMOVAL is unset if "git
45 * add -u" is calling us, In such a case, a
46 * missing work tree file needs to be removed
47 * if there is an unmerged entry at stage #2,
48 * but such a diff record is followed by
49 * another with DIFF_STATUS_DELETED (and if
50 * there is no stage #2, we won't see DELETED
51 * nor MODIFIED). We can simply continue
52 * either way.
54 if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL))
55 continue;
57 * Otherwise, it is "git add path" is asking
58 * to explicitly add it; we fall through. A
59 * missing work tree file is an error and is
60 * caught by add_file_to_index() in such a
61 * case.
63 case DIFF_STATUS_MODIFIED:
64 case DIFF_STATUS_TYPE_CHANGED:
65 if (add_file_to_index(&the_index, path, data->flags)) {
66 if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
67 die("updating files failed");
68 data->add_errors++;
70 break;
71 case DIFF_STATUS_DELETED:
72 if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
73 break;
74 if (!(data->flags & ADD_CACHE_PRETEND))
75 remove_file_from_index(&the_index, path);
76 if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
77 printf("remove '%s'\n", path);
78 break;
83 int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
85 struct update_callback_data data;
86 struct rev_info rev;
87 init_revisions(&rev, prefix);
88 setup_revisions(0, NULL, &rev, NULL);
89 rev.prune_data = pathspec;
90 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
91 rev.diffopt.format_callback = update_callback;
92 data.flags = flags;
93 data.add_errors = 0;
94 rev.diffopt.format_callback_data = &data;
95 run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
96 return !!data.add_errors;
99 static void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
101 int num_unmatched = 0, i;
104 * Since we are walking the index as if we were walking the directory,
105 * we have to mark the matched pathspec as seen; otherwise we will
106 * mistakenly think that the user gave a pathspec that did not match
107 * anything.
109 for (i = 0; i < specs; i++)
110 if (!seen[i])
111 num_unmatched++;
112 if (!num_unmatched)
113 return;
114 for (i = 0; i < active_nr; i++) {
115 struct cache_entry *ce = active_cache[i];
116 match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen);
120 static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
122 char *seen;
123 int i, specs;
124 struct dir_entry **src, **dst;
126 for (specs = 0; pathspec[specs]; specs++)
127 /* nothing */;
128 seen = xcalloc(specs, 1);
130 src = dst = dir->entries;
131 i = dir->nr;
132 while (--i >= 0) {
133 struct dir_entry *entry = *src++;
134 if (match_pathspec(pathspec, entry->name, entry->len,
135 prefix, seen))
136 *dst++ = entry;
138 dir->nr = dst - dir->entries;
139 fill_pathspec_matches(pathspec, seen, specs);
141 for (i = 0; i < specs; i++) {
142 if (!seen[i] && pathspec[i][0] && !file_exists(pathspec[i]))
143 die("pathspec '%s' did not match any files",
144 pathspec[i]);
146 free(seen);
149 static void treat_gitlinks(const char **pathspec)
151 int i;
153 if (!pathspec || !*pathspec)
154 return;
156 for (i = 0; i < active_nr; i++) {
157 struct cache_entry *ce = active_cache[i];
158 if (S_ISGITLINK(ce->ce_mode)) {
159 int len = ce_namelen(ce), j;
160 for (j = 0; pathspec[j]; j++) {
161 int len2 = strlen(pathspec[j]);
162 if (len2 <= len || pathspec[j][len] != '/' ||
163 memcmp(ce->name, pathspec[j], len))
164 continue;
165 if (len2 == len + 1)
166 /* strip trailing slash */
167 pathspec[j] = xstrndup(ce->name, len);
168 else
169 die ("Path '%s' is in submodule '%.*s'",
170 pathspec[j], len, ce->name);
176 static void refresh(int verbose, const char **pathspec)
178 char *seen;
179 int i, specs;
181 for (specs = 0; pathspec[specs]; specs++)
182 /* nothing */;
183 seen = xcalloc(specs, 1);
184 refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET,
185 pathspec, seen, "Unstaged changes after refreshing the index:");
186 for (i = 0; i < specs; i++) {
187 if (!seen[i])
188 die("pathspec '%s' did not match any files", pathspec[i]);
190 free(seen);
193 static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
195 const char **pathspec = get_pathspec(prefix, argv);
197 if (pathspec) {
198 const char **p;
199 for (p = pathspec; *p; p++) {
200 if (has_symlink_leading_path(*p, strlen(*p))) {
201 int len = prefix ? strlen(prefix) : 0;
202 die("'%s' is beyond a symbolic link", *p + len);
207 return pathspec;
210 int run_add_interactive(const char *revision, const char *patch_mode,
211 const char **pathspec)
213 int status, ac, pc = 0;
214 const char **args;
216 if (pathspec)
217 while (pathspec[pc])
218 pc++;
220 args = xcalloc(sizeof(const char *), (pc + 5));
221 ac = 0;
222 args[ac++] = "add--interactive";
223 if (patch_mode)
224 args[ac++] = patch_mode;
225 if (revision)
226 args[ac++] = revision;
227 args[ac++] = "--";
228 if (pc) {
229 memcpy(&(args[ac]), pathspec, sizeof(const char *) * pc);
230 ac += pc;
232 args[ac] = NULL;
234 status = run_command_v_opt(args, RUN_GIT_CMD);
235 free(args);
236 return status;
239 int interactive_add(int argc, const char **argv, const char *prefix)
241 const char **pathspec = NULL;
243 if (argc) {
244 pathspec = validate_pathspec(argc, argv, prefix);
245 if (!pathspec)
246 return -1;
249 return run_add_interactive(NULL,
250 patch_interactive ? "--patch" : NULL,
251 pathspec);
254 static int edit_patch(int argc, const char **argv, const char *prefix)
256 char *file = xstrdup(git_path("ADD_EDIT.patch"));
257 const char *apply_argv[] = { "apply", "--recount", "--cached",
258 file, NULL };
259 struct child_process child;
260 struct rev_info rev;
261 int out;
262 struct stat st;
264 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
266 if (read_cache() < 0)
267 die ("Could not read the index");
269 init_revisions(&rev, prefix);
270 rev.diffopt.context = 7;
272 argc = setup_revisions(argc, argv, &rev, NULL);
273 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
274 out = open(file, O_CREAT | O_WRONLY, 0644);
275 if (out < 0)
276 die ("Could not open '%s' for writing.", file);
277 rev.diffopt.file = xfdopen(out, "w");
278 rev.diffopt.close_file = 1;
279 if (run_diff_files(&rev, 0))
280 die ("Could not write patch");
282 launch_editor(file, NULL, NULL);
284 if (stat(file, &st))
285 die_errno("Could not stat '%s'", file);
286 if (!st.st_size)
287 die("Empty patch. Aborted.");
289 memset(&child, 0, sizeof(child));
290 child.git_cmd = 1;
291 child.argv = apply_argv;
292 if (run_command(&child))
293 die ("Could not apply '%s'", file);
295 unlink(file);
296 return 0;
299 static struct lock_file lock_file;
301 static const char ignore_error[] =
302 "The following paths are ignored by one of your .gitignore files:\n";
304 static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
305 static int ignore_add_errors, addremove, intent_to_add;
307 static struct option builtin_add_options[] = {
308 OPT__DRY_RUN(&show_only),
309 OPT__VERBOSE(&verbose),
310 OPT_GROUP(""),
311 OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
312 OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
313 OPT_BOOLEAN('e', "edit", &edit_interactive, "edit current diff and apply"),
314 OPT_BOOLEAN('f', "force", &ignored_too, "allow adding otherwise ignored files"),
315 OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
316 OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"),
317 OPT_BOOLEAN('A', "all", &addremove, "add all, noticing removal of tracked files"),
318 OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
319 OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
320 OPT_END(),
323 static int add_config(const char *var, const char *value, void *cb)
325 if (!strcasecmp(var, "add.ignore-errors")) {
326 ignore_add_errors = git_config_bool(var, value);
327 return 0;
329 return git_default_config(var, value, cb);
332 static int add_files(struct dir_struct *dir, int flags)
334 int i, exit_status = 0;
336 if (dir->ignored_nr) {
337 fprintf(stderr, ignore_error);
338 for (i = 0; i < dir->ignored_nr; i++)
339 fprintf(stderr, "%s\n", dir->ignored[i]->name);
340 fprintf(stderr, "Use -f if you really want to add them.\n");
341 die("no files added");
344 for (i = 0; i < dir->nr; i++)
345 if (add_file_to_cache(dir->entries[i]->name, flags)) {
346 if (!ignore_add_errors)
347 die("adding files failed");
348 exit_status = 1;
350 return exit_status;
353 int cmd_add(int argc, const char **argv, const char *prefix)
355 int exit_status = 0;
356 int newfd;
357 const char **pathspec;
358 struct dir_struct dir;
359 int flags;
360 int add_new_files;
361 int require_pathspec;
363 git_config(add_config, NULL);
365 argc = parse_options(argc, argv, prefix, builtin_add_options,
366 builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
367 if (patch_interactive)
368 add_interactive = 1;
369 if (add_interactive)
370 exit(interactive_add(argc - 1, argv + 1, prefix));
372 if (edit_interactive)
373 return(edit_patch(argc, argv, prefix));
374 argc--;
375 argv++;
377 if (addremove && take_worktree_changes)
378 die("-A and -u are mutually incompatible");
379 if ((addremove || take_worktree_changes) && !argc) {
380 static const char *here[2] = { ".", NULL };
381 argc = 1;
382 argv = here;
385 add_new_files = !take_worktree_changes && !refresh_only;
386 require_pathspec = !take_worktree_changes;
388 newfd = hold_locked_index(&lock_file, 1);
390 flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
391 (show_only ? ADD_CACHE_PRETEND : 0) |
392 (intent_to_add ? ADD_CACHE_INTENT : 0) |
393 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
394 (!(addremove || take_worktree_changes)
395 ? ADD_CACHE_IGNORE_REMOVAL : 0));
397 if (require_pathspec && argc == 0) {
398 fprintf(stderr, "Nothing specified, nothing added.\n");
399 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
400 return 0;
402 pathspec = validate_pathspec(argc, argv, prefix);
404 if (read_cache() < 0)
405 die("index file corrupt");
406 treat_gitlinks(pathspec);
408 if (add_new_files) {
409 int baselen;
411 /* Set up the default git porcelain excludes */
412 memset(&dir, 0, sizeof(dir));
413 if (!ignored_too) {
414 dir.flags |= DIR_COLLECT_IGNORED;
415 setup_standard_excludes(&dir);
418 /* This picks up the paths that are not tracked */
419 baselen = fill_directory(&dir, pathspec);
420 if (pathspec)
421 prune_directory(&dir, pathspec, baselen);
424 if (refresh_only) {
425 refresh(verbose, pathspec);
426 goto finish;
429 exit_status |= add_files_to_cache(prefix, pathspec, flags);
431 if (add_new_files)
432 exit_status |= add_files(&dir, flags);
434 finish:
435 if (active_cache_changed) {
436 if (write_cache(newfd, active_cache, active_nr) ||
437 commit_locked_index(&lock_file))
438 die("Unable to write new index file");
441 return exit_status;