]>
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" | |
6f525e71 | 9 | #include "pathspec.h" |
5cde71d6 | 10 | #include "exec_cmd.h" |
93872e07 | 11 | #include "cache-tree.h" |
58680165 | 12 | #include "run-command.h" |
5c46f754 | 13 | #include "parse-options.h" |
c59cb03a | 14 | #include "diff.h" |
fb7d3f32 | 15 | #include "diffcore.h" |
c59cb03a | 16 | #include "revision.h" |
568508e7 | 17 | #include "bulk-checkin.h" |
0d781539 | 18 | |
5c46f754 | 19 | static const char * const builtin_add_usage[] = { |
d32805dc | 20 | N_("git add [options] [--] <pathspec>..."), |
5c46f754 KH |
21 | NULL |
22 | }; | |
c59cb03a | 23 | static int patch_interactive, add_interactive, edit_interactive; |
93c44d49 | 24 | static int take_worktree_changes; |
896bdfa2 | 25 | |
9cba13ca | 26 | struct update_callback_data { |
fb7d3f32 LT |
27 | int flags; |
28 | int add_errors; | |
71c7b053 JN |
29 | const char *implicit_dot; |
30 | size_t implicit_dot_len; | |
d226b14d JH |
31 | |
32 | /* only needed for 2.0 transition preparation */ | |
33 | int warn_add_would_remove; | |
fb7d3f32 LT |
34 | }; |
35 | ||
e24afab0 JN |
36 | static const char *option_with_implicit_dot; |
37 | static const char *short_option_with_implicit_dot; | |
38 | ||
39 | static void warn_pathless_add(void) | |
40 | { | |
16d41d42 | 41 | static int shown; |
e24afab0 JN |
42 | assert(option_with_implicit_dot && short_option_with_implicit_dot); |
43 | ||
16d41d42 JN |
44 | if (shown) |
45 | return; | |
46 | shown = 1; | |
47 | ||
e24afab0 JN |
48 | /* |
49 | * To be consistent with "git add -p" and most Git | |
50 | * commands, we should default to being tree-wide, but | |
51 | * this is not the original behavior and can't be | |
52 | * changed until users trained themselves not to type | |
53 | * "git add -u" or "git add -A". For now, we warn and | |
54 | * keep the old behavior. Later, the behavior can be changed | |
55 | * to tree-wide, keeping the warning for a while, and | |
56 | * eventually we can drop the warning. | |
57 | */ | |
58 | warning(_("The behavior of 'git add %s (or %s)' with no path argument from a\n" | |
59 | "subdirectory of the tree will change in Git 2.0 and should not be used anymore.\n" | |
60 | "To add content for the whole tree, run:\n" | |
61 | "\n" | |
62 | " git add %s :/\n" | |
63 | " (or git add %s :/)\n" | |
64 | "\n" | |
65 | "To restrict the command to the current directory, run:\n" | |
66 | "\n" | |
67 | " git add %s .\n" | |
68 | " (or git add %s .)\n" | |
69 | "\n" | |
c9f35b8b MM |
70 | "With the current Git version, the command is restricted to " |
71 | "the current directory.\n" | |
72 | ""), | |
e24afab0 JN |
73 | option_with_implicit_dot, short_option_with_implicit_dot, |
74 | option_with_implicit_dot, short_option_with_implicit_dot, | |
75 | option_with_implicit_dot, short_option_with_implicit_dot); | |
76 | } | |
77 | ||
75973b2c JH |
78 | static int fix_unmerged_status(struct diff_filepair *p, |
79 | struct update_callback_data *data) | |
80 | { | |
81 | if (p->status != DIFF_STATUS_UNMERGED) | |
82 | return p->status; | |
83 | if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL) && !p->two->mode) | |
84 | /* | |
85 | * This is not an explicit add request, and the | |
86 | * path is missing from the working tree (deleted) | |
87 | */ | |
88 | return DIFF_STATUS_DELETED; | |
89 | else | |
90 | /* | |
91 | * Either an explicit add request, or path exists | |
92 | * in the working tree. An attempt to explicitly | |
93 | * add a path that does not exist in the working tree | |
94 | * will be caught as an error by the caller immediately. | |
95 | */ | |
96 | return DIFF_STATUS_MODIFIED; | |
97 | } | |
98 | ||
ccc663bc | 99 | static const char *add_would_remove_warning = N_( |
4c711430 JH |
100 | "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" |
101 | "whose behaviour will change in Git 2.0 with respect to paths you removed.\n" | |
102 | "Paths like '%s' that are\n" | |
103 | "removed from your working tree are ignored with this version of Git.\n" | |
ccc663bc | 104 | "\n" |
4c711430 JH |
105 | "* 'git add --ignore-removal <pathspec>', which is the current default,\n" |
106 | " ignores paths you removed from your working tree.\n" | |
ccc663bc JH |
107 | "\n" |
108 | "* 'git add --all <pathspec>' will let you also record the removals.\n" | |
109 | "\n" | |
110 | "Run 'git status' to check the paths you removed from your working tree.\n"); | |
111 | ||
d226b14d JH |
112 | static void warn_add_would_remove(const char *path) |
113 | { | |
ccc663bc | 114 | warning(_(add_would_remove_warning), path); |
d226b14d JH |
115 | } |
116 | ||
fb7d3f32 LT |
117 | static void update_callback(struct diff_queue_struct *q, |
118 | struct diff_options *opt, void *cbdata) | |
119 | { | |
120 | int i; | |
121 | struct update_callback_data *data = cbdata; | |
71c7b053 JN |
122 | const char *implicit_dot = data->implicit_dot; |
123 | size_t implicit_dot_len = data->implicit_dot_len; | |
fb7d3f32 LT |
124 | |
125 | for (i = 0; i < q->nr; i++) { | |
126 | struct diff_filepair *p = q->queue[i]; | |
127 | const char *path = p->one->path; | |
71c7b053 JN |
128 | /* |
129 | * Check if "git add -A" or "git add -u" was run from a | |
130 | * subdirectory with a modified file outside that directory, | |
131 | * and warn if so. | |
132 | * | |
133 | * "git add -u" will behave like "git add -u :/" instead of | |
134 | * "git add -u ." in the future. This warning prepares for | |
135 | * that change. | |
136 | */ | |
137 | if (implicit_dot && | |
138 | strncmp_icase(path, implicit_dot, implicit_dot_len)) { | |
139 | warn_pathless_add(); | |
140 | continue; | |
141 | } | |
75973b2c | 142 | switch (fix_unmerged_status(p, data)) { |
fb7d3f32 | 143 | default: |
990ac4be | 144 | die(_("unexpected diff status %c"), p->status); |
fb7d3f32 LT |
145 | case DIFF_STATUS_MODIFIED: |
146 | case DIFF_STATUS_TYPE_CHANGED: | |
147 | if (add_file_to_index(&the_index, path, data->flags)) { | |
148 | if (!(data->flags & ADD_CACHE_IGNORE_ERRORS)) | |
990ac4be | 149 | die(_("updating files failed")); |
fb7d3f32 LT |
150 | data->add_errors++; |
151 | } | |
152 | break; | |
153 | case DIFF_STATUS_DELETED: | |
d226b14d JH |
154 | if (data->warn_add_would_remove) { |
155 | warn_add_would_remove(path); | |
156 | data->warn_add_would_remove = 0; | |
157 | } | |
fb7d3f32 LT |
158 | if (data->flags & ADD_CACHE_IGNORE_REMOVAL) |
159 | break; | |
160 | if (!(data->flags & ADD_CACHE_PRETEND)) | |
161 | remove_file_from_index(&the_index, path); | |
162 | if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE)) | |
475c73eb | 163 | printf(_("remove '%s'\n"), path); |
fb7d3f32 LT |
164 | break; |
165 | } | |
166 | } | |
167 | } | |
168 | ||
d226b14d JH |
169 | static void update_files_in_cache(const char *prefix, const char **pathspec, |
170 | struct update_callback_data *data) | |
fb7d3f32 | 171 | { |
fb7d3f32 | 172 | struct rev_info rev; |
71c7b053 | 173 | |
fb7d3f32 LT |
174 | init_revisions(&rev, prefix); |
175 | setup_revisions(0, NULL, &rev, NULL); | |
afe069d1 | 176 | init_pathspec(&rev.prune_data, pathspec); |
fb7d3f32 LT |
177 | rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; |
178 | rev.diffopt.format_callback = update_callback; | |
d226b14d | 179 | rev.diffopt.format_callback_data = data; |
75973b2c | 180 | rev.max_count = 0; /* do not compare unmerged paths with stage #2 */ |
fb7d3f32 | 181 | run_diff_files(&rev, DIFF_RACY_IS_MODIFIED); |
d226b14d JH |
182 | } |
183 | ||
184 | int add_files_to_cache(const char *prefix, const char **pathspec, int flags) | |
185 | { | |
186 | struct update_callback_data data; | |
187 | ||
188 | memset(&data, 0, sizeof(data)); | |
189 | data.flags = flags; | |
190 | update_files_in_cache(prefix, pathspec, &data); | |
fb7d3f32 LT |
191 | return !!data.add_errors; |
192 | } | |
193 | ||
9df84e94 JN |
194 | #define WARN_IMPLICIT_DOT (1u << 0) |
195 | static char *prune_directory(struct dir_struct *dir, const char **pathspec, | |
196 | int prefix, unsigned flag) | |
0d781539 | 197 | { |
f2593398 LT |
198 | char *seen; |
199 | int i, specs; | |
0d781539 LT |
200 | struct dir_entry **src, **dst; |
201 | ||
f2593398 LT |
202 | for (specs = 0; pathspec[specs]; specs++) |
203 | /* nothing */; | |
28f75818 | 204 | seen = xcalloc(specs, 1); |
f2593398 | 205 | |
0d781539 LT |
206 | src = dst = dir->entries; |
207 | i = dir->nr; | |
208 | while (--i >= 0) { | |
209 | struct dir_entry *entry = *src++; | |
4d06f8ac JH |
210 | if (match_pathspec(pathspec, entry->name, entry->len, |
211 | prefix, seen)) | |
212 | *dst++ = entry; | |
9df84e94 JN |
213 | else if (flag & WARN_IMPLICIT_DOT) |
214 | /* | |
215 | * "git add -A" was run from a subdirectory with a | |
216 | * new file outside that directory. | |
217 | * | |
218 | * "git add -A" will behave like "git add -A :/" | |
219 | * instead of "git add -A ." in the future. | |
220 | * Warn about the coming behavior change. | |
221 | */ | |
222 | warn_pathless_add(); | |
0d781539 LT |
223 | } |
224 | dir->nr = dst - dir->entries; | |
4b78d7bc | 225 | add_pathspec_matches_against_index(pathspec, seen, specs); |
81f45e7d | 226 | return seen; |
0d781539 LT |
227 | } |
228 | ||
9d67b61f AS |
229 | /* |
230 | * Checks the index to see whether any path in pathspec refers to | |
231 | * something inside a submodule. If so, dies with an error message. | |
232 | */ | |
2ce53f9b JS |
233 | static void treat_gitlinks(const char **pathspec) |
234 | { | |
235 | int i; | |
236 | ||
237 | if (!pathspec || !*pathspec) | |
238 | return; | |
239 | ||
9d67b61f AS |
240 | for (i = 0; pathspec[i]; i++) |
241 | pathspec[i] = check_path_for_gitlink(pathspec[i]); | |
2ce53f9b JS |
242 | } |
243 | ||
d616813d AJ |
244 | static void refresh(int verbose, const char **pathspec) |
245 | { | |
246 | char *seen; | |
247 | int i, specs; | |
248 | ||
249 | for (specs = 0; pathspec[specs]; specs++) | |
250 | /* nothing */; | |
251 | seen = xcalloc(specs, 1); | |
43673fdd | 252 | refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET, |
ed2a808d | 253 | pathspec, seen, _("Unstaged changes after refreshing the index:")); |
d616813d AJ |
254 | for (i = 0; i < specs; i++) { |
255 | if (!seen[i]) | |
990ac4be | 256 | die(_("pathspec '%s' did not match any files"), pathspec[i]); |
d616813d | 257 | } |
399f0a8e | 258 | free(seen); |
d616813d AJ |
259 | } |
260 | ||
512aaf94 AS |
261 | /* |
262 | * Normalizes argv relative to prefix, via get_pathspec(), and then | |
263 | * runs die_if_path_beyond_symlink() on each path in the normalized | |
264 | * list. | |
265 | */ | |
f8a1113b | 266 | static const char **validate_pathspec(const char **argv, const char *prefix) |
3f061887 JH |
267 | { |
268 | const char **pathspec = get_pathspec(prefix, argv); | |
269 | ||
725b0605 JH |
270 | if (pathspec) { |
271 | const char **p; | |
272 | for (p = pathspec; *p; p++) { | |
512aaf94 | 273 | die_if_path_beyond_symlink(*p, prefix); |
725b0605 JH |
274 | } |
275 | } | |
276 | ||
3f061887 JH |
277 | return pathspec; |
278 | } | |
279 | ||
46b5139c TR |
280 | int run_add_interactive(const char *revision, const char *patch_mode, |
281 | const char **pathspec) | |
58680165 | 282 | { |
46b5139c | 283 | int status, ac, pc = 0; |
3f061887 | 284 | const char **args; |
3f061887 | 285 | |
46b5139c TR |
286 | if (pathspec) |
287 | while (pathspec[pc]) | |
288 | pc++; | |
324ccbd6 | 289 | |
46b5139c | 290 | args = xcalloc(sizeof(const char *), (pc + 5)); |
b63e9950 WC |
291 | ac = 0; |
292 | args[ac++] = "add--interactive"; | |
46b5139c TR |
293 | if (patch_mode) |
294 | args[ac++] = patch_mode; | |
295 | if (revision) | |
296 | args[ac++] = revision; | |
b63e9950 | 297 | args[ac++] = "--"; |
46b5139c TR |
298 | if (pc) { |
299 | memcpy(&(args[ac]), pathspec, sizeof(const char *) * pc); | |
300 | ac += pc; | |
b63e9950 WC |
301 | } |
302 | args[ac] = NULL; | |
7c0ab445 WC |
303 | |
304 | status = run_command_v_opt(args, RUN_GIT_CMD); | |
305 | free(args); | |
306 | return status; | |
58680165 KH |
307 | } |
308 | ||
b4bd4668 | 309 | int interactive_add(int argc, const char **argv, const char *prefix, int patch) |
46b5139c TR |
310 | { |
311 | const char **pathspec = NULL; | |
312 | ||
313 | if (argc) { | |
f8a1113b | 314 | pathspec = validate_pathspec(argv, prefix); |
46b5139c TR |
315 | if (!pathspec) |
316 | return -1; | |
317 | } | |
318 | ||
319 | return run_add_interactive(NULL, | |
b4bd4668 | 320 | patch ? "--patch" : NULL, |
46b5139c TR |
321 | pathspec); |
322 | } | |
323 | ||
2af202be | 324 | static int edit_patch(int argc, const char **argv, const char *prefix) |
c59cb03a | 325 | { |
d292bfaf | 326 | char *file = git_pathdup("ADD_EDIT.patch"); |
c59cb03a | 327 | const char *apply_argv[] = { "apply", "--recount", "--cached", |
66dbfd55 | 328 | NULL, NULL }; |
c59cb03a JS |
329 | struct child_process child; |
330 | struct rev_info rev; | |
331 | int out; | |
332 | struct stat st; | |
333 | ||
66dbfd55 GV |
334 | apply_argv[3] = file; |
335 | ||
c59cb03a JS |
336 | git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ |
337 | ||
338 | if (read_cache() < 0) | |
990ac4be | 339 | die (_("Could not read the index")); |
c59cb03a JS |
340 | |
341 | init_revisions(&rev, prefix); | |
342 | rev.diffopt.context = 7; | |
343 | ||
344 | argc = setup_revisions(argc, argv, &rev, NULL); | |
345 | rev.diffopt.output_format = DIFF_FORMAT_PATCH; | |
701825de | 346 | DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES); |
6ff2b729 | 347 | out = open(file, O_CREAT | O_WRONLY, 0666); |
c59cb03a | 348 | if (out < 0) |
990ac4be | 349 | die (_("Could not open '%s' for writing."), file); |
41698375 | 350 | rev.diffopt.file = xfdopen(out, "w"); |
c59cb03a JS |
351 | rev.diffopt.close_file = 1; |
352 | if (run_diff_files(&rev, 0)) | |
990ac4be | 353 | die (_("Could not write patch")); |
c59cb03a JS |
354 | |
355 | launch_editor(file, NULL, NULL); | |
356 | ||
357 | if (stat(file, &st)) | |
990ac4be | 358 | die_errno(_("Could not stat '%s'"), file); |
c59cb03a | 359 | if (!st.st_size) |
990ac4be | 360 | die(_("Empty patch. Aborted.")); |
c59cb03a JS |
361 | |
362 | memset(&child, 0, sizeof(child)); | |
363 | child.git_cmd = 1; | |
364 | child.argv = apply_argv; | |
365 | if (run_command(&child)) | |
990ac4be | 366 | die (_("Could not apply '%s'"), file); |
c59cb03a JS |
367 | |
368 | unlink(file); | |
d292bfaf | 369 | free(file); |
c59cb03a JS |
370 | return 0; |
371 | } | |
372 | ||
021b6e45 | 373 | static struct lock_file lock_file; |
0d781539 | 374 | |
b39c53e6 | 375 | static const char ignore_error[] = |
439fb829 | 376 | N_("The following paths are ignored by one of your .gitignore files:\n"); |
6a1ad325 | 377 | |
300c0a22 | 378 | static int verbose, show_only, ignored_too, refresh_only; |
45c45e30 JH |
379 | static int ignore_add_errors, intent_to_add, ignore_missing; |
380 | ||
381 | #define ADDREMOVE_DEFAULT 0 /* Change to 1 in Git 2.0 */ | |
382 | static int addremove = ADDREMOVE_DEFAULT; | |
383 | static int addremove_explicit = -1; /* unspecified */ | |
5c46f754 | 384 | |
9f60f49b JH |
385 | static int ignore_removal_cb(const struct option *opt, const char *arg, int unset) |
386 | { | |
387 | /* if we are told to ignore, we are not adding removals */ | |
388 | *(int *)opt->value = !unset ? 0 : 1; | |
389 | return 0; | |
390 | } | |
391 | ||
5c46f754 | 392 | static struct option builtin_add_options[] = { |
1b56024c NTND |
393 | OPT__DRY_RUN(&show_only, N_("dry run")), |
394 | OPT__VERBOSE(&verbose, N_("be verbose")), | |
5c46f754 | 395 | OPT_GROUP(""), |
300c0a22 JH |
396 | OPT_BOOL('i', "interactive", &add_interactive, N_("interactive picking")), |
397 | OPT_BOOL('p', "patch", &patch_interactive, N_("select hunks interactively")), | |
398 | OPT_BOOL('e', "edit", &edit_interactive, N_("edit current diff and apply")), | |
1b56024c | 399 | OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files")), |
300c0a22 JH |
400 | OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")), |
401 | OPT_BOOL('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")), | |
45c45e30 | 402 | OPT_BOOL('A', "all", &addremove_explicit, N_("add changes from all tracked and untracked files")), |
9f60f49b JH |
403 | { OPTION_CALLBACK, 0, "ignore-removal", &addremove_explicit, |
404 | NULL /* takes no arguments */, | |
405 | N_("ignore paths removed in the working tree (same as --no-all)"), | |
406 | PARSE_OPT_NOARG, ignore_removal_cb }, | |
300c0a22 JH |
407 | OPT_BOOL( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")), |
408 | OPT_BOOL( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")), | |
409 | OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")), | |
5c46f754 KH |
410 | OPT_END(), |
411 | }; | |
412 | ||
9bd81e42 | 413 | static int add_config(const char *var, const char *value, void *cb) |
dad25e4a | 414 | { |
8c2be75f JN |
415 | if (!strcmp(var, "add.ignoreerrors") || |
416 | !strcmp(var, "add.ignore-errors")) { | |
dad25e4a AR |
417 | ignore_add_errors = git_config_bool(var, value); |
418 | return 0; | |
419 | } | |
9bd81e42 | 420 | return git_default_config(var, value, cb); |
dad25e4a AR |
421 | } |
422 | ||
c972ec04 JH |
423 | static int add_files(struct dir_struct *dir, int flags) |
424 | { | |
425 | int i, exit_status = 0; | |
426 | ||
427 | if (dir->ignored_nr) { | |
439fb829 | 428 | fprintf(stderr, _(ignore_error)); |
c972ec04 JH |
429 | for (i = 0; i < dir->ignored_nr; i++) |
430 | fprintf(stderr, "%s\n", dir->ignored[i]->name); | |
439fb829 ÆAB |
431 | fprintf(stderr, _("Use -f if you really want to add them.\n")); |
432 | die(_("no files added")); | |
c972ec04 JH |
433 | } |
434 | ||
435 | for (i = 0; i < dir->nr; i++) | |
436 | if (add_file_to_cache(dir->entries[i]->name, flags)) { | |
437 | if (!ignore_add_errors) | |
990ac4be | 438 | die(_("adding files failed")); |
c972ec04 JH |
439 | exit_status = 1; |
440 | } | |
441 | return exit_status; | |
442 | } | |
443 | ||
a633fca0 | 444 | int cmd_add(int argc, const char **argv, const char *prefix) |
0d781539 | 445 | { |
7ae02a30 | 446 | int exit_status = 0; |
c972ec04 | 447 | int newfd; |
0d781539 LT |
448 | const char **pathspec; |
449 | struct dir_struct dir; | |
205ffa94 | 450 | int flags; |
c972ec04 JH |
451 | int add_new_files; |
452 | int require_pathspec; | |
81f45e7d | 453 | char *seen = NULL; |
71c7b053 | 454 | int implicit_dot = 0; |
d226b14d | 455 | struct update_callback_data update_data; |
5cde71d6 | 456 | |
ed342fde SB |
457 | git_config(add_config, NULL); |
458 | ||
37782920 | 459 | argc = parse_options(argc, argv, prefix, builtin_add_options, |
c59cb03a | 460 | builtin_add_usage, PARSE_OPT_KEEP_ARGV0); |
b63e9950 WC |
461 | if (patch_interactive) |
462 | add_interactive = 1; | |
7c0ab445 | 463 | if (add_interactive) |
b4bd4668 | 464 | exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive)); |
0d781539 | 465 | |
c59cb03a JS |
466 | if (edit_interactive) |
467 | return(edit_patch(argc, argv, prefix)); | |
468 | argc--; | |
469 | argv++; | |
470 | ||
45c45e30 JH |
471 | if (0 <= addremove_explicit) |
472 | addremove = addremove_explicit; | |
473 | else if (take_worktree_changes && ADDREMOVE_DEFAULT) | |
474 | addremove = 0; /* "-u" was given but not "-A" */ | |
475 | ||
3ba1f114 | 476 | if (addremove && take_worktree_changes) |
990ac4be | 477 | die(_("-A and -u are mutually incompatible")); |
45c45e30 JH |
478 | |
479 | /* | |
480 | * Warn when "git add pathspec..." was given without "-u" or "-A" | |
d226b14d | 481 | * and pathspec... covers a removed path. |
45c45e30 | 482 | */ |
d226b14d JH |
483 | memset(&update_data, 0, sizeof(update_data)); |
484 | if (!take_worktree_changes && addremove_explicit < 0) | |
485 | update_data.warn_add_would_remove = 1; | |
45c45e30 JH |
486 | |
487 | if (!take_worktree_changes && addremove_explicit < 0 && argc) | |
488 | /* | |
489 | * Turn "git add pathspec..." to "git add -A pathspec..." | |
490 | * in Git 2.0 but not yet | |
491 | */ | |
492 | ; /* addremove = 1; */ | |
493 | ||
108da0db | 494 | if (!show_only && ignore_missing) |
990ac4be | 495 | die(_("Option --ignore-missing can only be used together with --dry-run")); |
0fa2eb53 MM |
496 | if (addremove) { |
497 | option_with_implicit_dot = "--all"; | |
498 | short_option_with_implicit_dot = "-A"; | |
499 | } | |
500 | if (take_worktree_changes) { | |
501 | option_with_implicit_dot = "--update"; | |
502 | short_option_with_implicit_dot = "-u"; | |
503 | } | |
504 | if (option_with_implicit_dot && !argc) { | |
3ba1f114 JH |
505 | static const char *here[2] = { ".", NULL }; |
506 | argc = 1; | |
507 | argv = here; | |
71c7b053 | 508 | implicit_dot = 1; |
3ba1f114 JH |
509 | } |
510 | ||
c972ec04 JH |
511 | add_new_files = !take_worktree_changes && !refresh_only; |
512 | require_pathspec = !take_worktree_changes; | |
513 | ||
30ca07a2 | 514 | newfd = hold_locked_index(&lock_file, 1); |
0d781539 | 515 | |
205ffa94 | 516 | flags = ((verbose ? ADD_CACHE_VERBOSE : 0) | |
01665924 | 517 | (show_only ? ADD_CACHE_PRETEND : 0) | |
39425819 | 518 | (intent_to_add ? ADD_CACHE_INTENT : 0) | |
1e5f764c JH |
519 | (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) | |
520 | (!(addremove || take_worktree_changes) | |
71c7b053 JN |
521 | ? ADD_CACHE_IGNORE_REMOVAL : 0)) | |
522 | (implicit_dot ? ADD_CACHE_IMPLICIT_DOT : 0); | |
205ffa94 | 523 | |
c972ec04 | 524 | if (require_pathspec && argc == 0) { |
990ac4be ÆAB |
525 | fprintf(stderr, _("Nothing specified, nothing added.\n")); |
526 | fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n")); | |
93b0d86a JH |
527 | return 0; |
528 | } | |
f8a1113b | 529 | pathspec = validate_pathspec(argv, prefix); |
0d781539 | 530 | |
366bfcb6 | 531 | if (read_cache() < 0) |
990ac4be | 532 | die(_("index file corrupt")); |
2ce53f9b | 533 | treat_gitlinks(pathspec); |
366bfcb6 | 534 | |
1d8842d9 LT |
535 | if (add_new_files) { |
536 | int baselen; | |
537 | ||
538 | /* Set up the default git porcelain excludes */ | |
539 | memset(&dir, 0, sizeof(dir)); | |
540 | if (!ignored_too) { | |
541 | dir.flags |= DIR_COLLECT_IGNORED; | |
542 | setup_standard_excludes(&dir); | |
543 | } | |
544 | ||
1e5f764c | 545 | /* This picks up the paths that are not tracked */ |
9df84e94 | 546 | baselen = fill_directory(&dir, implicit_dot ? NULL : pathspec); |
1d8842d9 | 547 | if (pathspec) |
9df84e94 JN |
548 | seen = prune_directory(&dir, pathspec, baselen, |
549 | implicit_dot ? WARN_IMPLICIT_DOT : 0); | |
1d8842d9 | 550 | } |
1e5f764c | 551 | |
c972ec04 JH |
552 | if (refresh_only) { |
553 | refresh(verbose, pathspec); | |
554 | goto finish; | |
6a1ad325 JH |
555 | } |
556 | ||
81f45e7d JH |
557 | if (pathspec) { |
558 | int i; | |
eb69934b JH |
559 | struct path_exclude_check check; |
560 | ||
561 | path_exclude_check_init(&check, &dir); | |
81f45e7d | 562 | if (!seen) |
4b78d7bc | 563 | seen = find_pathspecs_matching_against_index(pathspec); |
81f45e7d JH |
564 | for (i = 0; pathspec[i]; i++) { |
565 | if (!seen[i] && pathspec[i][0] | |
108da0db JL |
566 | && !file_exists(pathspec[i])) { |
567 | if (ignore_missing) { | |
0188f6b3 | 568 | int dtype = DT_UNKNOWN; |
9013089c | 569 | if (is_path_excluded(&check, pathspec[i], -1, &dtype)) |
108da0db JL |
570 | dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i])); |
571 | } else | |
48168851 | 572 | die(_("pathspec '%s' did not match any files"), |
108da0db JL |
573 | pathspec[i]); |
574 | } | |
81f45e7d JH |
575 | } |
576 | free(seen); | |
eb69934b | 577 | path_exclude_check_clear(&check); |
81f45e7d JH |
578 | } |
579 | ||
568508e7 JH |
580 | plug_bulk_checkin(); |
581 | ||
561954bf JH |
582 | if ((flags & ADD_CACHE_IMPLICIT_DOT) && prefix) { |
583 | /* | |
584 | * Check for modified files throughout the worktree so | |
585 | * update_callback has a chance to warn about changes | |
586 | * outside the cwd. | |
587 | */ | |
588 | update_data.implicit_dot = prefix; | |
589 | update_data.implicit_dot_len = strlen(prefix); | |
590 | pathspec = NULL; | |
591 | } | |
592 | update_data.flags = flags & ~ADD_CACHE_IMPLICIT_DOT; | |
d226b14d | 593 | update_files_in_cache(prefix, pathspec, &update_data); |
c972ec04 | 594 | |
d226b14d | 595 | exit_status |= !!update_data.add_errors; |
c972ec04 JH |
596 | if (add_new_files) |
597 | exit_status |= add_files(&dir, flags); | |
0d781539 | 598 | |
568508e7 JH |
599 | unplug_bulk_checkin(); |
600 | ||
dfdac5d9 | 601 | finish: |
0d781539 LT |
602 | if (active_cache_changed) { |
603 | if (write_cache(newfd, active_cache, active_nr) || | |
4ed7cd3a | 604 | commit_locked_index(&lock_file)) |
990ac4be | 605 | die(_("Unable to write new index file")); |
0d781539 LT |
606 | } |
607 | ||
7ae02a30 | 608 | return exit_status; |
0d781539 | 609 | } |