]>
Commit | Line | Data |
---|---|---|
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 | 18 | static const char * const builtin_add_usage[] = { |
1b1dd23f | 19 | "git add [options] [--] <filepattern>...", |
5c46f754 KH |
20 | NULL |
21 | }; | |
c59cb03a | 22 | static int patch_interactive, add_interactive, edit_interactive; |
93c44d49 | 23 | static int take_worktree_changes; |
896bdfa2 | 24 | |
9cba13ca | 25 | struct update_callback_data { |
fb7d3f32 LT |
26 | int flags; |
27 | int add_errors; | |
28 | }; | |
29 | ||
75973b2c JH |
30 | static 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 |
51 | static 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 | ||
83 | int 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 |
100 | static 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 |
121 | static 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 | ||
133 | static 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 |
156 | static 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 |
183 | static 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 |
200 | static 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 |
217 | int 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 | 246 | int 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 | 261 | static int edit_patch(int argc, const char **argv, const char *prefix) |
c59cb03a JS |
262 | { |
263 | char *file = xstrdup(git_path("ADD_EDIT.patch")); | |
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); |
c59cb03a JS |
284 | out = open(file, O_CREAT | O_WRONLY, 0644); |
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); | |
306 | return 0; | |
307 | } | |
308 | ||
021b6e45 | 309 | static struct lock_file lock_file; |
0d781539 | 310 | |
b39c53e6 | 311 | static const char ignore_error[] = |
439fb829 | 312 | N_("The following paths are ignored by one of your .gitignore files:\n"); |
6a1ad325 | 313 | |
5c46f754 | 314 | static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0; |
108da0db | 315 | static int ignore_add_errors, addremove, intent_to_add, ignore_missing = 0; |
5c46f754 KH |
316 | |
317 | static struct option builtin_add_options[] = { | |
e21adb8c | 318 | OPT__DRY_RUN(&show_only, "dry run"), |
fd03881a | 319 | OPT__VERBOSE(&verbose, "be verbose"), |
5c46f754 KH |
320 | OPT_GROUP(""), |
321 | OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"), | |
08918e4a | 322 | OPT_BOOLEAN('p', "patch", &patch_interactive, "select hunks interactively"), |
c59cb03a | 323 | OPT_BOOLEAN('e', "edit", &edit_interactive, "edit current diff and apply"), |
76946b76 | 324 | OPT__FORCE(&ignored_too, "allow adding otherwise ignored files"), |
69c61c4f | 325 | OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"), |
39425819 | 326 | OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"), |
6e7293e3 | 327 | OPT_BOOLEAN('A', "all", &addremove, "add changes from all tracked and untracked files"), |
5c46f754 | 328 | OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"), |
984b83ef | 329 | OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"), |
108da0db | 330 | OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, "check if - even missing - files are ignored in dry run"), |
5c46f754 KH |
331 | OPT_END(), |
332 | }; | |
333 | ||
9bd81e42 | 334 | static int add_config(const char *var, const char *value, void *cb) |
dad25e4a | 335 | { |
8c2be75f JN |
336 | if (!strcmp(var, "add.ignoreerrors") || |
337 | !strcmp(var, "add.ignore-errors")) { | |
dad25e4a AR |
338 | ignore_add_errors = git_config_bool(var, value); |
339 | return 0; | |
340 | } | |
9bd81e42 | 341 | return git_default_config(var, value, cb); |
dad25e4a AR |
342 | } |
343 | ||
c972ec04 JH |
344 | static int add_files(struct dir_struct *dir, int flags) |
345 | { | |
346 | int i, exit_status = 0; | |
347 | ||
348 | if (dir->ignored_nr) { | |
439fb829 | 349 | fprintf(stderr, _(ignore_error)); |
c972ec04 JH |
350 | for (i = 0; i < dir->ignored_nr; i++) |
351 | fprintf(stderr, "%s\n", dir->ignored[i]->name); | |
439fb829 ÆAB |
352 | fprintf(stderr, _("Use -f if you really want to add them.\n")); |
353 | die(_("no files added")); | |
c972ec04 JH |
354 | } |
355 | ||
356 | for (i = 0; i < dir->nr; i++) | |
357 | if (add_file_to_cache(dir->entries[i]->name, flags)) { | |
358 | if (!ignore_add_errors) | |
990ac4be | 359 | die(_("adding files failed")); |
c972ec04 JH |
360 | exit_status = 1; |
361 | } | |
362 | return exit_status; | |
363 | } | |
364 | ||
a633fca0 | 365 | int cmd_add(int argc, const char **argv, const char *prefix) |
0d781539 | 366 | { |
7ae02a30 | 367 | int exit_status = 0; |
c972ec04 | 368 | int newfd; |
0d781539 LT |
369 | const char **pathspec; |
370 | struct dir_struct dir; | |
205ffa94 | 371 | int flags; |
c972ec04 JH |
372 | int add_new_files; |
373 | int require_pathspec; | |
81f45e7d | 374 | char *seen = NULL; |
5cde71d6 | 375 | |
ed342fde SB |
376 | git_config(add_config, NULL); |
377 | ||
37782920 | 378 | argc = parse_options(argc, argv, prefix, builtin_add_options, |
c59cb03a | 379 | builtin_add_usage, PARSE_OPT_KEEP_ARGV0); |
b63e9950 WC |
380 | if (patch_interactive) |
381 | add_interactive = 1; | |
7c0ab445 | 382 | if (add_interactive) |
b4bd4668 | 383 | exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive)); |
0d781539 | 384 | |
c59cb03a JS |
385 | if (edit_interactive) |
386 | return(edit_patch(argc, argv, prefix)); | |
387 | argc--; | |
388 | argv++; | |
389 | ||
3ba1f114 | 390 | if (addremove && take_worktree_changes) |
990ac4be | 391 | die(_("-A and -u are mutually incompatible")); |
108da0db | 392 | if (!show_only && ignore_missing) |
990ac4be | 393 | die(_("Option --ignore-missing can only be used together with --dry-run")); |
1e5f764c | 394 | if ((addremove || take_worktree_changes) && !argc) { |
3ba1f114 JH |
395 | static const char *here[2] = { ".", NULL }; |
396 | argc = 1; | |
397 | argv = here; | |
398 | } | |
399 | ||
c972ec04 JH |
400 | add_new_files = !take_worktree_changes && !refresh_only; |
401 | require_pathspec = !take_worktree_changes; | |
402 | ||
30ca07a2 | 403 | newfd = hold_locked_index(&lock_file, 1); |
0d781539 | 404 | |
205ffa94 | 405 | flags = ((verbose ? ADD_CACHE_VERBOSE : 0) | |
01665924 | 406 | (show_only ? ADD_CACHE_PRETEND : 0) | |
39425819 | 407 | (intent_to_add ? ADD_CACHE_INTENT : 0) | |
1e5f764c JH |
408 | (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) | |
409 | (!(addremove || take_worktree_changes) | |
410 | ? ADD_CACHE_IGNORE_REMOVAL : 0)); | |
205ffa94 | 411 | |
c972ec04 | 412 | if (require_pathspec && argc == 0) { |
990ac4be ÆAB |
413 | fprintf(stderr, _("Nothing specified, nothing added.\n")); |
414 | fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n")); | |
93b0d86a JH |
415 | return 0; |
416 | } | |
725b0605 | 417 | pathspec = validate_pathspec(argc, argv, prefix); |
0d781539 | 418 | |
366bfcb6 | 419 | if (read_cache() < 0) |
990ac4be | 420 | die(_("index file corrupt")); |
2ce53f9b | 421 | treat_gitlinks(pathspec); |
366bfcb6 | 422 | |
1d8842d9 LT |
423 | if (add_new_files) { |
424 | int baselen; | |
425 | ||
426 | /* Set up the default git porcelain excludes */ | |
427 | memset(&dir, 0, sizeof(dir)); | |
428 | if (!ignored_too) { | |
429 | dir.flags |= DIR_COLLECT_IGNORED; | |
430 | setup_standard_excludes(&dir); | |
431 | } | |
432 | ||
1e5f764c | 433 | /* This picks up the paths that are not tracked */ |
1d8842d9 LT |
434 | baselen = fill_directory(&dir, pathspec); |
435 | if (pathspec) | |
81f45e7d | 436 | seen = prune_directory(&dir, pathspec, baselen); |
1d8842d9 | 437 | } |
1e5f764c | 438 | |
c972ec04 JH |
439 | if (refresh_only) { |
440 | refresh(verbose, pathspec); | |
441 | goto finish; | |
6a1ad325 JH |
442 | } |
443 | ||
81f45e7d JH |
444 | if (pathspec) { |
445 | int i; | |
446 | if (!seen) | |
447 | seen = find_used_pathspec(pathspec); | |
448 | for (i = 0; pathspec[i]; i++) { | |
449 | if (!seen[i] && pathspec[i][0] | |
108da0db JL |
450 | && !file_exists(pathspec[i])) { |
451 | if (ignore_missing) { | |
0188f6b3 NTND |
452 | int dtype = DT_UNKNOWN; |
453 | if (excluded(&dir, pathspec[i], &dtype)) | |
108da0db JL |
454 | dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i])); |
455 | } else | |
48168851 | 456 | die(_("pathspec '%s' did not match any files"), |
108da0db JL |
457 | pathspec[i]); |
458 | } | |
81f45e7d JH |
459 | } |
460 | free(seen); | |
461 | } | |
462 | ||
568508e7 JH |
463 | plug_bulk_checkin(); |
464 | ||
1e5f764c | 465 | exit_status |= add_files_to_cache(prefix, pathspec, flags); |
c972ec04 JH |
466 | |
467 | if (add_new_files) | |
468 | exit_status |= add_files(&dir, flags); | |
0d781539 | 469 | |
568508e7 JH |
470 | unplug_bulk_checkin(); |
471 | ||
dfdac5d9 | 472 | finish: |
0d781539 LT |
473 | if (active_cache_changed) { |
474 | if (write_cache(newfd, active_cache, active_nr) || | |
4ed7cd3a | 475 | commit_locked_index(&lock_file)) |
990ac4be | 476 | die(_("Unable to write new index file")); |
0d781539 LT |
477 | } |
478 | ||
7ae02a30 | 479 | return exit_status; |
0d781539 | 480 | } |