git add: Add the "--ignore-missing" option for the dry run
[git/git.git] / builtin / add.c
CommitLineData
0d781539
LT
1/*
2 * "git add" builtin command
3 *
4 * Copyright (C) 2006 Linus Torvalds
5 */
0d781539
LT
6#include "cache.h"
7#include "builtin.h"
8#include "dir.h"
5cde71d6 9#include "exec_cmd.h"
93872e07 10#include "cache-tree.h"
58680165 11#include "run-command.h"
5c46f754 12#include "parse-options.h"
c59cb03a 13#include "diff.h"
fb7d3f32 14#include "diffcore.h"
c59cb03a 15#include "revision.h"
0d781539 16
5c46f754 17static const char * const builtin_add_usage[] = {
1b1dd23f 18 "git add [options] [--] <filepattern>...",
5c46f754
KH
19 NULL
20};
c59cb03a 21static int patch_interactive, add_interactive, edit_interactive;
93c44d49 22static int take_worktree_changes;
896bdfa2 23
fb7d3f32
LT
24struct update_callback_data
25{
26 int flags;
27 int add_errors;
28};
29
30static void update_callback(struct diff_queue_struct *q,
31 struct diff_options *opt, void *cbdata)
32{
33 int i;
34 struct update_callback_data *data = cbdata;
35
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:
43 /*
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.
53 */
54 if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL))
55 continue;
56 /*
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.
62 */
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++;
69 }
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;
79 }
80 }
81}
82
83int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
84{
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;
97}
98
1e5f764c
JH
99static void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
100{
101 int num_unmatched = 0, i;
102
103 /*
71fe9451 104 * Since we are walking the index as if we were walking the directory,
1e5f764c
JH
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.
108 */
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);
117 }
118}
119
81f45e7d
JH
120static char *find_used_pathspec(const char **pathspec)
121{
122 char *seen;
123 int i;
124
125 for (i = 0; pathspec[i]; i++)
126 ; /* just counting */
127 seen = xcalloc(i, 1);
128 fill_pathspec_matches(pathspec, seen, i);
129 return seen;
130}
131
132static char *prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
0d781539 133{
f2593398
LT
134 char *seen;
135 int i, specs;
0d781539
LT
136 struct dir_entry **src, **dst;
137
f2593398
LT
138 for (specs = 0; pathspec[specs]; specs++)
139 /* nothing */;
28f75818 140 seen = xcalloc(specs, 1);
f2593398 141
0d781539
LT
142 src = dst = dir->entries;
143 i = dir->nr;
144 while (--i >= 0) {
145 struct dir_entry *entry = *src++;
4d06f8ac
JH
146 if (match_pathspec(pathspec, entry->name, entry->len,
147 prefix, seen))
148 *dst++ = entry;
0d781539
LT
149 }
150 dir->nr = dst - dir->entries;
1e5f764c 151 fill_pathspec_matches(pathspec, seen, specs);
81f45e7d 152 return seen;
0d781539
LT
153}
154
2ce53f9b
JS
155static void treat_gitlinks(const char **pathspec)
156{
157 int i;
158
159 if (!pathspec || !*pathspec)
160 return;
161
162 for (i = 0; i < active_nr; i++) {
163 struct cache_entry *ce = active_cache[i];
164 if (S_ISGITLINK(ce->ce_mode)) {
165 int len = ce_namelen(ce), j;
166 for (j = 0; pathspec[j]; j++) {
167 int len2 = strlen(pathspec[j]);
168 if (len2 <= len || pathspec[j][len] != '/' ||
169 memcmp(ce->name, pathspec[j], len))
170 continue;
171 if (len2 == len + 1)
172 /* strip trailing slash */
173 pathspec[j] = xstrndup(ce->name, len);
174 else
175 die ("Path '%s' is in submodule '%.*s'",
176 pathspec[j], len, ce->name);
177 }
178 }
179 }
180}
181
d616813d
AJ
182static void refresh(int verbose, const char **pathspec)
183{
184 char *seen;
185 int i, specs;
186
187 for (specs = 0; pathspec[specs]; specs++)
188 /* nothing */;
189 seen = xcalloc(specs, 1);
43673fdd 190 refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET,
3deffc52 191 pathspec, seen, "Unstaged changes after refreshing the index:");
d616813d
AJ
192 for (i = 0; i < specs; i++) {
193 if (!seen[i])
194 die("pathspec '%s' did not match any files", pathspec[i]);
195 }
399f0a8e 196 free(seen);
d616813d
AJ
197}
198
3f061887
JH
199static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
200{
201 const char **pathspec = get_pathspec(prefix, argv);
202
725b0605
JH
203 if (pathspec) {
204 const char **p;
205 for (p = pathspec; *p; p++) {
57199892 206 if (has_symlink_leading_path(*p, strlen(*p))) {
725b0605
JH
207 int len = prefix ? strlen(prefix) : 0;
208 die("'%s' is beyond a symbolic link", *p + len);
209 }
210 }
211 }
212
3f061887
JH
213 return pathspec;
214}
215
46b5139c
TR
216int run_add_interactive(const char *revision, const char *patch_mode,
217 const char **pathspec)
58680165 218{
46b5139c 219 int status, ac, pc = 0;
3f061887 220 const char **args;
3f061887 221
46b5139c
TR
222 if (pathspec)
223 while (pathspec[pc])
224 pc++;
324ccbd6 225
46b5139c 226 args = xcalloc(sizeof(const char *), (pc + 5));
b63e9950
WC
227 ac = 0;
228 args[ac++] = "add--interactive";
46b5139c
TR
229 if (patch_mode)
230 args[ac++] = patch_mode;
231 if (revision)
232 args[ac++] = revision;
b63e9950 233 args[ac++] = "--";
46b5139c
TR
234 if (pc) {
235 memcpy(&(args[ac]), pathspec, sizeof(const char *) * pc);
236 ac += pc;
b63e9950
WC
237 }
238 args[ac] = NULL;
7c0ab445
WC
239
240 status = run_command_v_opt(args, RUN_GIT_CMD);
241 free(args);
242 return status;
58680165
KH
243}
244
46b5139c
TR
245int interactive_add(int argc, const char **argv, const char *prefix)
246{
247 const char **pathspec = NULL;
248
249 if (argc) {
250 pathspec = validate_pathspec(argc, argv, prefix);
251 if (!pathspec)
252 return -1;
253 }
254
255 return run_add_interactive(NULL,
256 patch_interactive ? "--patch" : NULL,
257 pathspec);
258}
259
2af202be 260static int edit_patch(int argc, const char **argv, const char *prefix)
c59cb03a
JS
261{
262 char *file = xstrdup(git_path("ADD_EDIT.patch"));
263 const char *apply_argv[] = { "apply", "--recount", "--cached",
66dbfd55 264 NULL, NULL };
c59cb03a
JS
265 struct child_process child;
266 struct rev_info rev;
267 int out;
268 struct stat st;
269
66dbfd55
GV
270 apply_argv[3] = file;
271
c59cb03a
JS
272 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
273
274 if (read_cache() < 0)
275 die ("Could not read the index");
276
277 init_revisions(&rev, prefix);
278 rev.diffopt.context = 7;
279
280 argc = setup_revisions(argc, argv, &rev, NULL);
281 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
282 out = open(file, O_CREAT | O_WRONLY, 0644);
283 if (out < 0)
284 die ("Could not open '%s' for writing.", file);
41698375 285 rev.diffopt.file = xfdopen(out, "w");
c59cb03a
JS
286 rev.diffopt.close_file = 1;
287 if (run_diff_files(&rev, 0))
288 die ("Could not write patch");
289
290 launch_editor(file, NULL, NULL);
291
292 if (stat(file, &st))
0721c314 293 die_errno("Could not stat '%s'", file);
c59cb03a
JS
294 if (!st.st_size)
295 die("Empty patch. Aborted.");
296
297 memset(&child, 0, sizeof(child));
298 child.git_cmd = 1;
299 child.argv = apply_argv;
300 if (run_command(&child))
301 die ("Could not apply '%s'", file);
302
303 unlink(file);
304 return 0;
305}
306
021b6e45 307static struct lock_file lock_file;
0d781539 308
b39c53e6 309static const char ignore_error[] =
6a1ad325
JH
310"The following paths are ignored by one of your .gitignore files:\n";
311
5c46f754 312static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
108da0db 313static int ignore_add_errors, addremove, intent_to_add, ignore_missing = 0;
5c46f754
KH
314
315static struct option builtin_add_options[] = {
316 OPT__DRY_RUN(&show_only),
317 OPT__VERBOSE(&verbose),
318 OPT_GROUP(""),
319 OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
b63e9950 320 OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
c59cb03a 321 OPT_BOOLEAN('e', "edit", &edit_interactive, "edit current diff and apply"),
69c61c4f
SG
322 OPT_BOOLEAN('f', "force", &ignored_too, "allow adding otherwise ignored files"),
323 OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
39425819 324 OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"),
3ba1f114 325 OPT_BOOLEAN('A', "all", &addremove, "add all, noticing removal of tracked files"),
5c46f754 326 OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
984b83ef 327 OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
108da0db 328 OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, "check if - even missing - files are ignored in dry run"),
5c46f754
KH
329 OPT_END(),
330};
331
9bd81e42 332static int add_config(const char *var, const char *value, void *cb)
dad25e4a
AR
333{
334 if (!strcasecmp(var, "add.ignore-errors")) {
335 ignore_add_errors = git_config_bool(var, value);
336 return 0;
337 }
9bd81e42 338 return git_default_config(var, value, cb);
dad25e4a
AR
339}
340
c972ec04
JH
341static int add_files(struct dir_struct *dir, int flags)
342{
343 int i, exit_status = 0;
344
345 if (dir->ignored_nr) {
346 fprintf(stderr, ignore_error);
347 for (i = 0; i < dir->ignored_nr; i++)
348 fprintf(stderr, "%s\n", dir->ignored[i]->name);
349 fprintf(stderr, "Use -f if you really want to add them.\n");
350 die("no files added");
351 }
352
353 for (i = 0; i < dir->nr; i++)
354 if (add_file_to_cache(dir->entries[i]->name, flags)) {
355 if (!ignore_add_errors)
356 die("adding files failed");
357 exit_status = 1;
358 }
359 return exit_status;
360}
361
a633fca0 362int cmd_add(int argc, const char **argv, const char *prefix)
0d781539 363{
7ae02a30 364 int exit_status = 0;
c972ec04 365 int newfd;
0d781539
LT
366 const char **pathspec;
367 struct dir_struct dir;
205ffa94 368 int flags;
c972ec04
JH
369 int add_new_files;
370 int require_pathspec;
81f45e7d 371 char *seen = NULL;
5cde71d6 372
ed342fde
SB
373 git_config(add_config, NULL);
374
37782920 375 argc = parse_options(argc, argv, prefix, builtin_add_options,
c59cb03a 376 builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
b63e9950
WC
377 if (patch_interactive)
378 add_interactive = 1;
7c0ab445 379 if (add_interactive)
c59cb03a 380 exit(interactive_add(argc - 1, argv + 1, prefix));
0d781539 381
c59cb03a
JS
382 if (edit_interactive)
383 return(edit_patch(argc, argv, prefix));
384 argc--;
385 argv++;
386
3ba1f114
JH
387 if (addremove && take_worktree_changes)
388 die("-A and -u are mutually incompatible");
108da0db
JL
389 if (!show_only && ignore_missing)
390 die("Option --ignore-missing can only be used together with --dry-run");
1e5f764c 391 if ((addremove || take_worktree_changes) && !argc) {
3ba1f114
JH
392 static const char *here[2] = { ".", NULL };
393 argc = 1;
394 argv = here;
395 }
396
c972ec04
JH
397 add_new_files = !take_worktree_changes && !refresh_only;
398 require_pathspec = !take_worktree_changes;
399
30ca07a2 400 newfd = hold_locked_index(&lock_file, 1);
0d781539 401
205ffa94 402 flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
01665924 403 (show_only ? ADD_CACHE_PRETEND : 0) |
39425819 404 (intent_to_add ? ADD_CACHE_INTENT : 0) |
1e5f764c
JH
405 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
406 (!(addremove || take_worktree_changes)
407 ? ADD_CACHE_IGNORE_REMOVAL : 0));
205ffa94 408
c972ec04 409 if (require_pathspec && argc == 0) {
93b0d86a
JH
410 fprintf(stderr, "Nothing specified, nothing added.\n");
411 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
412 return 0;
413 }
725b0605 414 pathspec = validate_pathspec(argc, argv, prefix);
0d781539 415
366bfcb6
NP
416 if (read_cache() < 0)
417 die("index file corrupt");
2ce53f9b 418 treat_gitlinks(pathspec);
366bfcb6 419
1d8842d9
LT
420 if (add_new_files) {
421 int baselen;
422
423 /* Set up the default git porcelain excludes */
424 memset(&dir, 0, sizeof(dir));
425 if (!ignored_too) {
426 dir.flags |= DIR_COLLECT_IGNORED;
427 setup_standard_excludes(&dir);
428 }
429
1e5f764c 430 /* This picks up the paths that are not tracked */
1d8842d9
LT
431 baselen = fill_directory(&dir, pathspec);
432 if (pathspec)
81f45e7d 433 seen = prune_directory(&dir, pathspec, baselen);
1d8842d9 434 }
1e5f764c 435
c972ec04
JH
436 if (refresh_only) {
437 refresh(verbose, pathspec);
438 goto finish;
6a1ad325
JH
439 }
440
81f45e7d
JH
441 if (pathspec) {
442 int i;
443 if (!seen)
444 seen = find_used_pathspec(pathspec);
445 for (i = 0; pathspec[i]; i++) {
446 if (!seen[i] && pathspec[i][0]
108da0db
JL
447 && !file_exists(pathspec[i])) {
448 if (ignore_missing) {
449 if (excluded(&dir, pathspec[i], DT_UNKNOWN))
450 dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i]));
451 } else
452 die("pathspec '%s' did not match any files",
453 pathspec[i]);
454 }
81f45e7d
JH
455 }
456 free(seen);
457 }
458
1e5f764c 459 exit_status |= add_files_to_cache(prefix, pathspec, flags);
c972ec04
JH
460
461 if (add_new_files)
462 exit_status |= add_files(&dir, flags);
0d781539 463
dfdac5d9 464 finish:
0d781539
LT
465 if (active_cache_changed) {
466 if (write_cache(newfd, active_cache, active_nr) ||
4ed7cd3a 467 commit_locked_index(&lock_file))
0d781539
LT
468 die("Unable to write new index file");
469 }
470
7ae02a30 471 return exit_status;
0d781539 472}