Merge branch 'ye/doc-http-proto' into maint
[git.git] / builtin / add.c
blob459208a326cd4cebfa813168d81a06c27fc54fc5
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 "pathspec.h"
10 #include "exec_cmd.h"
11 #include "cache-tree.h"
12 #include "run-command.h"
13 #include "parse-options.h"
14 #include "diff.h"
15 #include "diffcore.h"
16 #include "revision.h"
17 #include "bulk-checkin.h"
18 #include "argv-array.h"
20 static const char * const builtin_add_usage[] = {
21 N_("git add [options] [--] <pathspec>..."),
22 NULL
24 static int patch_interactive, add_interactive, edit_interactive;
25 static int take_worktree_changes;
27 struct update_callback_data {
28 int flags;
29 int add_errors;
32 static int fix_unmerged_status(struct diff_filepair *p,
33 struct update_callback_data *data)
35 if (p->status != DIFF_STATUS_UNMERGED)
36 return p->status;
37 if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL) && !p->two->mode)
39 * This is not an explicit add request, and the
40 * path is missing from the working tree (deleted)
42 return DIFF_STATUS_DELETED;
43 else
45 * Either an explicit add request, or path exists
46 * in the working tree. An attempt to explicitly
47 * add a path that does not exist in the working tree
48 * will be caught as an error by the caller immediately.
50 return DIFF_STATUS_MODIFIED;
53 static void update_callback(struct diff_queue_struct *q,
54 struct diff_options *opt, void *cbdata)
56 int i;
57 struct update_callback_data *data = cbdata;
59 for (i = 0; i < q->nr; i++) {
60 struct diff_filepair *p = q->queue[i];
61 const char *path = p->one->path;
62 switch (fix_unmerged_status(p, data)) {
63 default:
64 die(_("unexpected diff status %c"), p->status);
65 case DIFF_STATUS_MODIFIED:
66 case DIFF_STATUS_TYPE_CHANGED:
67 if (add_file_to_index(&the_index, path, data->flags)) {
68 if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
69 die(_("updating files failed"));
70 data->add_errors++;
72 break;
73 case DIFF_STATUS_DELETED:
74 if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
75 break;
76 if (!(data->flags & ADD_CACHE_PRETEND))
77 remove_file_from_index(&the_index, path);
78 if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
79 printf(_("remove '%s'\n"), path);
80 break;
85 int add_files_to_cache(const char *prefix,
86 const struct pathspec *pathspec, int flags)
88 struct update_callback_data data;
89 struct rev_info rev;
91 memset(&data, 0, sizeof(data));
92 data.flags = flags;
94 init_revisions(&rev, prefix);
95 setup_revisions(0, NULL, &rev, NULL);
96 if (pathspec)
97 copy_pathspec(&rev.prune_data, pathspec);
98 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
99 rev.diffopt.format_callback = update_callback;
100 rev.diffopt.format_callback_data = &data;
101 rev.max_count = 0; /* do not compare unmerged paths with stage #2 */
102 run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
103 return !!data.add_errors;
106 static char *prune_directory(struct dir_struct *dir, struct pathspec *pathspec, int prefix)
108 char *seen;
109 int i;
110 struct dir_entry **src, **dst;
112 seen = xcalloc(pathspec->nr, 1);
114 src = dst = dir->entries;
115 i = dir->nr;
116 while (--i >= 0) {
117 struct dir_entry *entry = *src++;
118 if (dir_path_match(entry, pathspec, prefix, seen))
119 *dst++ = entry;
121 dir->nr = dst - dir->entries;
122 add_pathspec_matches_against_index(pathspec, seen);
123 return seen;
126 static void refresh(int verbose, const struct pathspec *pathspec)
128 char *seen;
129 int i;
131 seen = xcalloc(pathspec->nr, 1);
132 refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET,
133 pathspec, seen, _("Unstaged changes after refreshing the index:"));
134 for (i = 0; i < pathspec->nr; i++) {
135 if (!seen[i])
136 die(_("pathspec '%s' did not match any files"),
137 pathspec->items[i].match);
139 free(seen);
142 int run_add_interactive(const char *revision, const char *patch_mode,
143 const struct pathspec *pathspec)
145 int status, i;
146 struct argv_array argv = ARGV_ARRAY_INIT;
148 argv_array_push(&argv, "add--interactive");
149 if (patch_mode)
150 argv_array_push(&argv, patch_mode);
151 if (revision)
152 argv_array_push(&argv, revision);
153 argv_array_push(&argv, "--");
154 for (i = 0; i < pathspec->nr; i++)
155 /* pass original pathspec, to be re-parsed */
156 argv_array_push(&argv, pathspec->items[i].original);
158 status = run_command_v_opt(argv.argv, RUN_GIT_CMD);
159 argv_array_clear(&argv);
160 return status;
163 int interactive_add(int argc, const char **argv, const char *prefix, int patch)
165 struct pathspec pathspec;
167 parse_pathspec(&pathspec, 0,
168 PATHSPEC_PREFER_FULL |
169 PATHSPEC_SYMLINK_LEADING_PATH |
170 PATHSPEC_PREFIX_ORIGIN,
171 prefix, argv);
173 return run_add_interactive(NULL,
174 patch ? "--patch" : NULL,
175 &pathspec);
178 static int edit_patch(int argc, const char **argv, const char *prefix)
180 char *file = git_pathdup("ADD_EDIT.patch");
181 const char *apply_argv[] = { "apply", "--recount", "--cached",
182 NULL, NULL };
183 struct child_process child;
184 struct rev_info rev;
185 int out;
186 struct stat st;
188 apply_argv[3] = file;
190 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
192 if (read_cache() < 0)
193 die(_("Could not read the index"));
195 init_revisions(&rev, prefix);
196 rev.diffopt.context = 7;
198 argc = setup_revisions(argc, argv, &rev, NULL);
199 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
200 rev.diffopt.use_color = 0;
201 DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES);
202 out = open(file, O_CREAT | O_WRONLY, 0666);
203 if (out < 0)
204 die(_("Could not open '%s' for writing."), file);
205 rev.diffopt.file = xfdopen(out, "w");
206 rev.diffopt.close_file = 1;
207 if (run_diff_files(&rev, 0))
208 die(_("Could not write patch"));
210 launch_editor(file, NULL, NULL);
212 if (stat(file, &st))
213 die_errno(_("Could not stat '%s'"), file);
214 if (!st.st_size)
215 die(_("Empty patch. Aborted."));
217 memset(&child, 0, sizeof(child));
218 child.git_cmd = 1;
219 child.argv = apply_argv;
220 if (run_command(&child))
221 die(_("Could not apply '%s'"), file);
223 unlink(file);
224 free(file);
225 return 0;
228 static struct lock_file lock_file;
230 static const char ignore_error[] =
231 N_("The following paths are ignored by one of your .gitignore files:\n");
233 static int verbose, show_only, ignored_too, refresh_only;
234 static int ignore_add_errors, intent_to_add, ignore_missing;
236 #define ADDREMOVE_DEFAULT 1
237 static int addremove = ADDREMOVE_DEFAULT;
238 static int addremove_explicit = -1; /* unspecified */
240 static int ignore_removal_cb(const struct option *opt, const char *arg, int unset)
242 /* if we are told to ignore, we are not adding removals */
243 *(int *)opt->value = !unset ? 0 : 1;
244 return 0;
247 static struct option builtin_add_options[] = {
248 OPT__DRY_RUN(&show_only, N_("dry run")),
249 OPT__VERBOSE(&verbose, N_("be verbose")),
250 OPT_GROUP(""),
251 OPT_BOOL('i', "interactive", &add_interactive, N_("interactive picking")),
252 OPT_BOOL('p', "patch", &patch_interactive, N_("select hunks interactively")),
253 OPT_BOOL('e', "edit", &edit_interactive, N_("edit current diff and apply")),
254 OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files")),
255 OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")),
256 OPT_BOOL('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")),
257 OPT_BOOL('A', "all", &addremove_explicit, N_("add changes from all tracked and untracked files")),
258 { OPTION_CALLBACK, 0, "ignore-removal", &addremove_explicit,
259 NULL /* takes no arguments */,
260 N_("ignore paths removed in the working tree (same as --no-all)"),
261 PARSE_OPT_NOARG, ignore_removal_cb },
262 OPT_BOOL( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")),
263 OPT_BOOL( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")),
264 OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")),
265 OPT_END(),
268 static int add_config(const char *var, const char *value, void *cb)
270 if (!strcmp(var, "add.ignoreerrors") ||
271 !strcmp(var, "add.ignore-errors")) {
272 ignore_add_errors = git_config_bool(var, value);
273 return 0;
275 return git_default_config(var, value, cb);
278 static int add_files(struct dir_struct *dir, int flags)
280 int i, exit_status = 0;
282 if (dir->ignored_nr) {
283 fprintf(stderr, _(ignore_error));
284 for (i = 0; i < dir->ignored_nr; i++)
285 fprintf(stderr, "%s\n", dir->ignored[i]->name);
286 fprintf(stderr, _("Use -f if you really want to add them.\n"));
287 die(_("no files added"));
290 for (i = 0; i < dir->nr; i++)
291 if (add_file_to_cache(dir->entries[i]->name, flags)) {
292 if (!ignore_add_errors)
293 die(_("adding files failed"));
294 exit_status = 1;
296 return exit_status;
299 int cmd_add(int argc, const char **argv, const char *prefix)
301 int exit_status = 0;
302 int newfd;
303 struct pathspec pathspec;
304 struct dir_struct dir;
305 int flags;
306 int add_new_files;
307 int require_pathspec;
308 char *seen = NULL;
310 git_config(add_config, NULL);
312 argc = parse_options(argc, argv, prefix, builtin_add_options,
313 builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
314 if (patch_interactive)
315 add_interactive = 1;
316 if (add_interactive)
317 exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive));
319 if (edit_interactive)
320 return(edit_patch(argc, argv, prefix));
321 argc--;
322 argv++;
324 if (0 <= addremove_explicit)
325 addremove = addremove_explicit;
326 else if (take_worktree_changes && ADDREMOVE_DEFAULT)
327 addremove = 0; /* "-u" was given but not "-A" */
329 if (addremove && take_worktree_changes)
330 die(_("-A and -u are mutually incompatible"));
332 if (!take_worktree_changes && addremove_explicit < 0 && argc)
333 /* Turn "git add pathspec..." to "git add -A pathspec..." */
334 addremove = 1;
336 if (!show_only && ignore_missing)
337 die(_("Option --ignore-missing can only be used together with --dry-run"));
339 if ((0 < addremove_explicit || take_worktree_changes) && !argc) {
340 static const char *whole[2] = { ":/", NULL };
341 argc = 1;
342 argv = whole;
345 add_new_files = !take_worktree_changes && !refresh_only;
346 require_pathspec = !take_worktree_changes;
348 newfd = hold_locked_index(&lock_file, 1);
350 flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
351 (show_only ? ADD_CACHE_PRETEND : 0) |
352 (intent_to_add ? ADD_CACHE_INTENT : 0) |
353 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
354 (!(addremove || take_worktree_changes)
355 ? ADD_CACHE_IGNORE_REMOVAL : 0));
357 if (require_pathspec && argc == 0) {
358 fprintf(stderr, _("Nothing specified, nothing added.\n"));
359 fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n"));
360 return 0;
363 if (read_cache() < 0)
364 die(_("index file corrupt"));
367 * Check the "pathspec '%s' did not match any files" block
368 * below before enabling new magic.
370 parse_pathspec(&pathspec, 0,
371 PATHSPEC_PREFER_FULL |
372 PATHSPEC_SYMLINK_LEADING_PATH |
373 PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE,
374 prefix, argv);
376 if (add_new_files) {
377 int baselen;
378 struct pathspec empty_pathspec;
380 /* Set up the default git porcelain excludes */
381 memset(&dir, 0, sizeof(dir));
382 if (!ignored_too) {
383 dir.flags |= DIR_COLLECT_IGNORED;
384 setup_standard_excludes(&dir);
387 memset(&empty_pathspec, 0, sizeof(empty_pathspec));
388 /* This picks up the paths that are not tracked */
389 baselen = fill_directory(&dir, &pathspec);
390 if (pathspec.nr)
391 seen = prune_directory(&dir, &pathspec, baselen);
394 if (refresh_only) {
395 refresh(verbose, &pathspec);
396 goto finish;
399 if (pathspec.nr) {
400 int i;
402 if (!seen)
403 seen = find_pathspecs_matching_against_index(&pathspec);
406 * file_exists() assumes exact match
408 GUARD_PATHSPEC(&pathspec,
409 PATHSPEC_FROMTOP |
410 PATHSPEC_LITERAL |
411 PATHSPEC_GLOB |
412 PATHSPEC_ICASE |
413 PATHSPEC_EXCLUDE);
415 for (i = 0; i < pathspec.nr; i++) {
416 const char *path = pathspec.items[i].match;
417 if (pathspec.items[i].magic & PATHSPEC_EXCLUDE)
418 continue;
419 if (!seen[i] && path[0] &&
420 ((pathspec.items[i].magic &
421 (PATHSPEC_GLOB | PATHSPEC_ICASE)) ||
422 !file_exists(path))) {
423 if (ignore_missing) {
424 int dtype = DT_UNKNOWN;
425 if (is_excluded(&dir, path, &dtype))
426 dir_add_ignored(&dir, path, pathspec.items[i].len);
427 } else
428 die(_("pathspec '%s' did not match any files"),
429 pathspec.items[i].original);
432 free(seen);
435 plug_bulk_checkin();
437 exit_status |= add_files_to_cache(prefix, &pathspec, flags);
439 if (add_new_files)
440 exit_status |= add_files(&dir, flags);
442 unplug_bulk_checkin();
444 finish:
445 if (active_cache_changed) {
446 if (write_cache(newfd, active_cache, active_nr) ||
447 commit_locked_index(&lock_file))
448 die(_("Unable to write new index file"));
451 return exit_status;