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