]>
Commit | Line | Data |
---|---|---|
0d781539 LT |
1 | /* |
2 | * "git add" builtin command | |
3 | * | |
4 | * Copyright (C) 2006 Linus Torvalds | |
5 | */ | |
f8adbec9 | 6 | #define USE_THE_INDEX_COMPATIBILITY_MACROS |
0d781539 | 7 | #include "cache.h" |
b2141fc1 | 8 | #include "config.h" |
0d781539 | 9 | #include "builtin.h" |
697cc8ef | 10 | #include "lockfile.h" |
0d781539 | 11 | #include "dir.h" |
6f525e71 | 12 | #include "pathspec.h" |
d807c4a0 | 13 | #include "exec-cmd.h" |
93872e07 | 14 | #include "cache-tree.h" |
58680165 | 15 | #include "run-command.h" |
5c46f754 | 16 | #include "parse-options.h" |
c59cb03a | 17 | #include "diff.h" |
fb7d3f32 | 18 | #include "diffcore.h" |
c59cb03a | 19 | #include "revision.h" |
568508e7 | 20 | #include "bulk-checkin.h" |
c45a18e8 | 21 | #include "argv-array.h" |
bdab9721 | 22 | #include "submodule.h" |
f83dff60 | 23 | #include "add-interactive.h" |
0d781539 | 24 | |
5c46f754 | 25 | static const char * const builtin_add_usage[] = { |
9c9b4f2f | 26 | N_("git add [<options>] [--] <pathspec>..."), |
5c46f754 KH |
27 | NULL |
28 | }; | |
c59cb03a | 29 | static int patch_interactive, add_interactive, edit_interactive; |
93c44d49 | 30 | static int take_worktree_changes; |
9472935d | 31 | static int add_renormalize; |
bebb5d6d AM |
32 | static int pathspec_file_nul; |
33 | static const char *pathspec_from_file; | |
90a6bb98 | 34 | static int legacy_stash_p; /* support for the scripted `git stash` */ |
896bdfa2 | 35 | |
9cba13ca | 36 | struct update_callback_data { |
610d55af | 37 | int flags; |
fb7d3f32 LT |
38 | int add_errors; |
39 | }; | |
40 | ||
1e22a991 | 41 | static void chmod_pathspec(struct pathspec *pathspec, char flip) |
610d55af TG |
42 | { |
43 | int i; | |
44 | ||
45 | for (i = 0; i < active_nr; i++) { | |
46 | struct cache_entry *ce = active_cache[i]; | |
47 | ||
6d2df284 | 48 | if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL)) |
610d55af TG |
49 | continue; |
50 | ||
1e22a991 RJ |
51 | if (chmod_cache_entry(ce, flip) < 0) |
52 | fprintf(stderr, "cannot chmod %cx '%s'\n", flip, ce->name); | |
610d55af TG |
53 | } |
54 | } | |
55 | ||
75973b2c JH |
56 | static int fix_unmerged_status(struct diff_filepair *p, |
57 | struct update_callback_data *data) | |
58 | { | |
59 | if (p->status != DIFF_STATUS_UNMERGED) | |
60 | return p->status; | |
61 | if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL) && !p->two->mode) | |
62 | /* | |
63 | * This is not an explicit add request, and the | |
64 | * path is missing from the working tree (deleted) | |
65 | */ | |
66 | return DIFF_STATUS_DELETED; | |
67 | else | |
68 | /* | |
69 | * Either an explicit add request, or path exists | |
70 | * in the working tree. An attempt to explicitly | |
71 | * add a path that does not exist in the working tree | |
72 | * will be caught as an error by the caller immediately. | |
73 | */ | |
74 | return DIFF_STATUS_MODIFIED; | |
75 | } | |
76 | ||
fb7d3f32 LT |
77 | static void update_callback(struct diff_queue_struct *q, |
78 | struct diff_options *opt, void *cbdata) | |
79 | { | |
80 | int i; | |
81 | struct update_callback_data *data = cbdata; | |
82 | ||
83 | for (i = 0; i < q->nr; i++) { | |
84 | struct diff_filepair *p = q->queue[i]; | |
85 | const char *path = p->one->path; | |
75973b2c | 86 | switch (fix_unmerged_status(p, data)) { |
fb7d3f32 | 87 | default: |
990ac4be | 88 | die(_("unexpected diff status %c"), p->status); |
fb7d3f32 LT |
89 | case DIFF_STATUS_MODIFIED: |
90 | case DIFF_STATUS_TYPE_CHANGED: | |
610d55af | 91 | if (add_file_to_index(&the_index, path, data->flags)) { |
fb7d3f32 | 92 | if (!(data->flags & ADD_CACHE_IGNORE_ERRORS)) |
990ac4be | 93 | die(_("updating files failed")); |
fb7d3f32 LT |
94 | data->add_errors++; |
95 | } | |
96 | break; | |
97 | case DIFF_STATUS_DELETED: | |
98 | if (data->flags & ADD_CACHE_IGNORE_REMOVAL) | |
99 | break; | |
100 | if (!(data->flags & ADD_CACHE_PRETEND)) | |
101 | remove_file_from_index(&the_index, path); | |
102 | if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE)) | |
475c73eb | 103 | printf(_("remove '%s'\n"), path); |
fb7d3f32 LT |
104 | break; |
105 | } | |
106 | } | |
107 | } | |
108 | ||
610d55af TG |
109 | int add_files_to_cache(const char *prefix, |
110 | const struct pathspec *pathspec, int flags) | |
fb7d3f32 | 111 | { |
160c4b18 | 112 | struct update_callback_data data; |
fb7d3f32 | 113 | struct rev_info rev; |
71c7b053 | 114 | |
160c4b18 JH |
115 | memset(&data, 0, sizeof(data)); |
116 | data.flags = flags; | |
117 | ||
2abf3503 | 118 | repo_init_revisions(the_repository, &rev, prefix); |
fb7d3f32 | 119 | setup_revisions(0, NULL, &rev, NULL); |
3efe8e43 NTND |
120 | if (pathspec) |
121 | copy_pathspec(&rev.prune_data, pathspec); | |
fb7d3f32 LT |
122 | rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; |
123 | rev.diffopt.format_callback = update_callback; | |
160c4b18 | 124 | rev.diffopt.format_callback_data = &data; |
0d1e0e78 | 125 | rev.diffopt.flags.override_submodule_config = 1; |
75973b2c | 126 | rev.max_count = 0; /* do not compare unmerged paths with stage #2 */ |
fb7d3f32 | 127 | run_diff_files(&rev, DIFF_RACY_IS_MODIFIED); |
fe6a01af | 128 | clear_pathspec(&rev.prune_data); |
fb7d3f32 LT |
129 | return !!data.add_errors; |
130 | } | |
131 | ||
9472935d TB |
132 | static int renormalize_tracked_files(const struct pathspec *pathspec, int flags) |
133 | { | |
134 | int i, retval = 0; | |
135 | ||
136 | for (i = 0; i < active_nr; i++) { | |
137 | struct cache_entry *ce = active_cache[i]; | |
138 | ||
139 | if (ce_stage(ce)) | |
140 | continue; /* do not touch unmerged paths */ | |
141 | if (!S_ISREG(ce->ce_mode) && !S_ISLNK(ce->ce_mode)) | |
142 | continue; /* do not touch non blobs */ | |
6d2df284 | 143 | if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL)) |
9472935d | 144 | continue; |
9e5da3d0 | 145 | retval |= add_file_to_cache(ce->name, flags | ADD_CACHE_RENORMALIZE); |
9472935d TB |
146 | } |
147 | ||
148 | return retval; | |
149 | } | |
150 | ||
053a6b18 | 151 | static char *prune_directory(struct dir_struct *dir, struct pathspec *pathspec, int prefix) |
0d781539 | 152 | { |
f2593398 | 153 | char *seen; |
84b8b5d1 | 154 | int i; |
0d781539 LT |
155 | struct dir_entry **src, **dst; |
156 | ||
84b8b5d1 | 157 | seen = xcalloc(pathspec->nr, 1); |
f2593398 | 158 | |
0d781539 LT |
159 | src = dst = dir->entries; |
160 | i = dir->nr; | |
161 | while (--i >= 0) { | |
162 | struct dir_entry *entry = *src++; | |
6d2df284 | 163 | if (dir_path_match(&the_index, entry, pathspec, prefix, seen)) |
4d06f8ac | 164 | *dst++ = entry; |
0d781539 LT |
165 | } |
166 | dir->nr = dst - dir->entries; | |
08de9151 | 167 | add_pathspec_matches_against_index(pathspec, &the_index, seen); |
81f45e7d | 168 | return seen; |
0d781539 LT |
169 | } |
170 | ||
9b2d6149 | 171 | static void refresh(int verbose, const struct pathspec *pathspec) |
d616813d AJ |
172 | { |
173 | char *seen; | |
9b2d6149 | 174 | int i; |
d616813d | 175 | |
9b2d6149 | 176 | seen = xcalloc(pathspec->nr, 1); |
43673fdd | 177 | refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET, |
ed2a808d | 178 | pathspec, seen, _("Unstaged changes after refreshing the index:")); |
9b2d6149 | 179 | for (i = 0; i < pathspec->nr; i++) { |
d616813d | 180 | if (!seen[i]) |
9b2d6149 NTND |
181 | die(_("pathspec '%s' did not match any files"), |
182 | pathspec->items[i].match); | |
d616813d | 183 | } |
ec36c42a | 184 | free(seen); |
d616813d AJ |
185 | } |
186 | ||
46b5139c | 187 | int run_add_interactive(const char *revision, const char *patch_mode, |
480ca644 | 188 | const struct pathspec *pathspec) |
58680165 | 189 | { |
c45a18e8 FR |
190 | int status, i; |
191 | struct argv_array argv = ARGV_ARRAY_INIT; | |
f83dff60 JS |
192 | int use_builtin_add_i = |
193 | git_env_bool("GIT_TEST_ADD_I_USE_BUILTIN", -1); | |
194 | ||
f6aa7ecc JS |
195 | if (use_builtin_add_i < 0) |
196 | git_config_get_bool("add.interactive.usebuiltin", | |
197 | &use_builtin_add_i); | |
198 | ||
199 | if (use_builtin_add_i == 1) { | |
d2a233cb JS |
200 | enum add_p_mode mode; |
201 | ||
f6aa7ecc | 202 | if (!patch_mode) |
f83dff60 | 203 | return !!run_add_i(the_repository, pathspec); |
d2a233cb JS |
204 | |
205 | if (!strcmp(patch_mode, "--patch")) | |
206 | mode = ADD_P_ADD; | |
36bae1dc JS |
207 | else if (!strcmp(patch_mode, "--patch=stash")) |
208 | mode = ADD_P_STASH; | |
209 | else if (!strcmp(patch_mode, "--patch=reset")) | |
210 | mode = ADD_P_RESET; | |
52628f94 JS |
211 | else if (!strcmp(patch_mode, "--patch=checkout")) |
212 | mode = ADD_P_CHECKOUT; | |
cee6cb73 JS |
213 | else if (!strcmp(patch_mode, "--patch=worktree")) |
214 | mode = ADD_P_WORKTREE; | |
d2a233cb | 215 | else |
52628f94 | 216 | die("'%s' not supported", patch_mode); |
d2a233cb JS |
217 | |
218 | return !!run_add_p(the_repository, mode, revision, pathspec); | |
f83dff60 | 219 | } |
3f061887 | 220 | |
c45a18e8 | 221 | argv_array_push(&argv, "add--interactive"); |
46b5139c | 222 | if (patch_mode) |
c45a18e8 | 223 | argv_array_push(&argv, patch_mode); |
46b5139c | 224 | if (revision) |
c45a18e8 FR |
225 | argv_array_push(&argv, revision); |
226 | argv_array_push(&argv, "--"); | |
480ca644 NTND |
227 | for (i = 0; i < pathspec->nr; i++) |
228 | /* pass original pathspec, to be re-parsed */ | |
c45a18e8 | 229 | argv_array_push(&argv, pathspec->items[i].original); |
7c0ab445 | 230 | |
c45a18e8 FR |
231 | status = run_command_v_opt(argv.argv, RUN_GIT_CMD); |
232 | argv_array_clear(&argv); | |
7c0ab445 | 233 | return status; |
58680165 KH |
234 | } |
235 | ||
b4bd4668 | 236 | int interactive_add(int argc, const char **argv, const char *prefix, int patch) |
46b5139c | 237 | { |
5a76aff1 | 238 | struct pathspec pathspec; |
46b5139c | 239 | |
625c3304 | 240 | parse_pathspec(&pathspec, 0, |
5a76aff1 | 241 | PATHSPEC_PREFER_FULL | |
480ca644 NTND |
242 | PATHSPEC_SYMLINK_LEADING_PATH | |
243 | PATHSPEC_PREFIX_ORIGIN, | |
5a76aff1 | 244 | prefix, argv); |
46b5139c TR |
245 | |
246 | return run_add_interactive(NULL, | |
b4bd4668 | 247 | patch ? "--patch" : NULL, |
480ca644 | 248 | &pathspec); |
46b5139c TR |
249 | } |
250 | ||
2af202be | 251 | static int edit_patch(int argc, const char **argv, const char *prefix) |
c59cb03a | 252 | { |
d292bfaf | 253 | char *file = git_pathdup("ADD_EDIT.patch"); |
c59cb03a | 254 | const char *apply_argv[] = { "apply", "--recount", "--cached", |
66dbfd55 | 255 | NULL, NULL }; |
d3180279 | 256 | struct child_process child = CHILD_PROCESS_INIT; |
c59cb03a JS |
257 | struct rev_info rev; |
258 | int out; | |
259 | struct stat st; | |
260 | ||
66dbfd55 GV |
261 | apply_argv[3] = file; |
262 | ||
c59cb03a JS |
263 | git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ |
264 | ||
265 | if (read_cache() < 0) | |
d521abf8 | 266 | die(_("Could not read the index")); |
c59cb03a | 267 | |
2abf3503 | 268 | repo_init_revisions(the_repository, &rev, prefix); |
c59cb03a JS |
269 | rev.diffopt.context = 7; |
270 | ||
271 | argc = setup_revisions(argc, argv, &rev, NULL); | |
272 | rev.diffopt.output_format = DIFF_FORMAT_PATCH; | |
7f3b8c62 | 273 | rev.diffopt.use_color = 0; |
0d1e0e78 | 274 | rev.diffopt.flags.ignore_dirty_submodules = 1; |
fa6f225e | 275 | out = open(file, O_CREAT | O_WRONLY | O_TRUNC, 0666); |
c59cb03a | 276 | if (out < 0) |
d521abf8 | 277 | die(_("Could not open '%s' for writing."), file); |
41698375 | 278 | rev.diffopt.file = xfdopen(out, "w"); |
c59cb03a JS |
279 | rev.diffopt.close_file = 1; |
280 | if (run_diff_files(&rev, 0)) | |
d521abf8 | 281 | die(_("Could not write patch")); |
c59cb03a | 282 | |
cb64800d JK |
283 | if (launch_editor(file, NULL, NULL)) |
284 | die(_("editing patch failed")); | |
c59cb03a JS |
285 | |
286 | if (stat(file, &st)) | |
990ac4be | 287 | die_errno(_("Could not stat '%s'"), file); |
c59cb03a | 288 | if (!st.st_size) |
990ac4be | 289 | die(_("Empty patch. Aborted.")); |
c59cb03a | 290 | |
c59cb03a JS |
291 | child.git_cmd = 1; |
292 | child.argv = apply_argv; | |
293 | if (run_command(&child)) | |
d521abf8 | 294 | die(_("Could not apply '%s'"), file); |
c59cb03a JS |
295 | |
296 | unlink(file); | |
d292bfaf | 297 | free(file); |
c59cb03a JS |
298 | return 0; |
299 | } | |
300 | ||
b39c53e6 | 301 | static const char ignore_error[] = |
439fb829 | 302 | N_("The following paths are ignored by one of your .gitignore files:\n"); |
6a1ad325 | 303 | |
300c0a22 | 304 | static int verbose, show_only, ignored_too, refresh_only; |
45c45e30 | 305 | static int ignore_add_errors, intent_to_add, ignore_missing; |
53213994 | 306 | static int warn_on_embedded_repo = 1; |
45c45e30 | 307 | |
fdc97abd | 308 | #define ADDREMOVE_DEFAULT 1 |
45c45e30 JH |
309 | static int addremove = ADDREMOVE_DEFAULT; |
310 | static int addremove_explicit = -1; /* unspecified */ | |
5c46f754 | 311 | |
4e55ed32 ET |
312 | static char *chmod_arg; |
313 | ||
9f60f49b JH |
314 | static int ignore_removal_cb(const struct option *opt, const char *arg, int unset) |
315 | { | |
316 | /* if we are told to ignore, we are not adding removals */ | |
317 | *(int *)opt->value = !unset ? 0 : 1; | |
318 | return 0; | |
319 | } | |
320 | ||
5c46f754 | 321 | static struct option builtin_add_options[] = { |
1b56024c NTND |
322 | OPT__DRY_RUN(&show_only, N_("dry run")), |
323 | OPT__VERBOSE(&verbose, N_("be verbose")), | |
5c46f754 | 324 | OPT_GROUP(""), |
300c0a22 JH |
325 | OPT_BOOL('i', "interactive", &add_interactive, N_("interactive picking")), |
326 | OPT_BOOL('p', "patch", &patch_interactive, N_("select hunks interactively")), | |
327 | OPT_BOOL('e', "edit", &edit_interactive, N_("edit current diff and apply")), | |
1224781d | 328 | OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files"), 0), |
300c0a22 | 329 | OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")), |
9472935d | 330 | OPT_BOOL(0, "renormalize", &add_renormalize, N_("renormalize EOL of tracked files (implies -u)")), |
300c0a22 | 331 | OPT_BOOL('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")), |
45c45e30 | 332 | OPT_BOOL('A', "all", &addremove_explicit, N_("add changes from all tracked and untracked files")), |
9f60f49b JH |
333 | { OPTION_CALLBACK, 0, "ignore-removal", &addremove_explicit, |
334 | NULL /* takes no arguments */, | |
335 | N_("ignore paths removed in the working tree (same as --no-all)"), | |
336 | PARSE_OPT_NOARG, ignore_removal_cb }, | |
300c0a22 JH |
337 | OPT_BOOL( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")), |
338 | OPT_BOOL( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")), | |
339 | OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")), | |
5f0df44c RS |
340 | OPT_STRING(0, "chmod", &chmod_arg, "(+|-)x", |
341 | N_("override the executable bit of the listed files")), | |
53213994 JK |
342 | OPT_HIDDEN_BOOL(0, "warn-embedded-repo", &warn_on_embedded_repo, |
343 | N_("warn when adding an embedded repository")), | |
90a6bb98 JS |
344 | OPT_HIDDEN_BOOL(0, "legacy-stash-p", &legacy_stash_p, |
345 | N_("backend for `git stash -p`")), | |
bebb5d6d AM |
346 | OPT_PATHSPEC_FROM_FILE(&pathspec_from_file), |
347 | OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul), | |
5c46f754 KH |
348 | OPT_END(), |
349 | }; | |
350 | ||
9bd81e42 | 351 | static int add_config(const char *var, const char *value, void *cb) |
dad25e4a | 352 | { |
8c2be75f JN |
353 | if (!strcmp(var, "add.ignoreerrors") || |
354 | !strcmp(var, "add.ignore-errors")) { | |
dad25e4a AR |
355 | ignore_add_errors = git_config_bool(var, value); |
356 | return 0; | |
357 | } | |
f83dff60 | 358 | |
9bd81e42 | 359 | return git_default_config(var, value, cb); |
dad25e4a AR |
360 | } |
361 | ||
53213994 JK |
362 | static const char embedded_advice[] = N_( |
363 | "You've added another git repository inside your current repository.\n" | |
364 | "Clones of the outer repository will not contain the contents of\n" | |
365 | "the embedded repository and will not know how to obtain it.\n" | |
366 | "If you meant to add a submodule, use:\n" | |
367 | "\n" | |
368 | " git submodule add <url> %s\n" | |
369 | "\n" | |
370 | "If you added this path by mistake, you can remove it from the\n" | |
371 | "index with:\n" | |
372 | "\n" | |
373 | " git rm --cached %s\n" | |
374 | "\n" | |
375 | "See \"git help submodule\" for more information." | |
376 | ); | |
377 | ||
378 | static void check_embedded_repo(const char *path) | |
379 | { | |
380 | struct strbuf name = STRBUF_INIT; | |
381 | ||
382 | if (!warn_on_embedded_repo) | |
383 | return; | |
384 | if (!ends_with(path, "/")) | |
385 | return; | |
386 | ||
387 | /* Drop trailing slash for aesthetics */ | |
388 | strbuf_addstr(&name, path); | |
389 | strbuf_strip_suffix(&name, "/"); | |
390 | ||
391 | warning(_("adding embedded git repository: %s"), name.buf); | |
392 | if (advice_add_embedded_repo) { | |
393 | advise(embedded_advice, name.buf, name.buf); | |
394 | /* there may be multiple entries; advise only once */ | |
395 | advice_add_embedded_repo = 0; | |
396 | } | |
397 | ||
398 | strbuf_release(&name); | |
399 | } | |
400 | ||
610d55af | 401 | static int add_files(struct dir_struct *dir, int flags) |
c972ec04 JH |
402 | { |
403 | int i, exit_status = 0; | |
404 | ||
405 | if (dir->ignored_nr) { | |
439fb829 | 406 | fprintf(stderr, _(ignore_error)); |
c972ec04 JH |
407 | for (i = 0; i < dir->ignored_nr; i++) |
408 | fprintf(stderr, "%s\n", dir->ignored[i]->name); | |
887a0fd5 HW |
409 | if (advice_add_ignored_file) |
410 | advise(_("Use -f if you really want to add them.\n" | |
411 | "Turn this message off by running\n" | |
412 | "\"git config advice.addIgnoredFile false\"")); | |
1d31e5a2 | 413 | exit_status = 1; |
c972ec04 JH |
414 | } |
415 | ||
53213994 | 416 | for (i = 0; i < dir->nr; i++) { |
610d55af | 417 | if (add_file_to_index(&the_index, dir->entries[i]->name, flags)) { |
c972ec04 | 418 | if (!ignore_add_errors) |
990ac4be | 419 | die(_("adding files failed")); |
c972ec04 | 420 | exit_status = 1; |
f937bc2f KM |
421 | } else { |
422 | check_embedded_repo(dir->entries[i]->name); | |
c972ec04 | 423 | } |
53213994 | 424 | } |
c972ec04 JH |
425 | return exit_status; |
426 | } | |
427 | ||
a633fca0 | 428 | int cmd_add(int argc, const char **argv, const char *prefix) |
0d781539 | 429 | { |
7ae02a30 | 430 | int exit_status = 0; |
5a76aff1 | 431 | struct pathspec pathspec; |
0d781539 | 432 | struct dir_struct dir; |
610d55af | 433 | int flags; |
c972ec04 JH |
434 | int add_new_files; |
435 | int require_pathspec; | |
81f45e7d | 436 | char *seen = NULL; |
0fa5a2ed | 437 | struct lock_file lock_file = LOCK_INIT; |
5cde71d6 | 438 | |
ed342fde SB |
439 | git_config(add_config, NULL); |
440 | ||
37782920 | 441 | argc = parse_options(argc, argv, prefix, builtin_add_options, |
c59cb03a | 442 | builtin_add_usage, PARSE_OPT_KEEP_ARGV0); |
b63e9950 WC |
443 | if (patch_interactive) |
444 | add_interactive = 1; | |
bebb5d6d AM |
445 | if (add_interactive) { |
446 | if (pathspec_from_file) | |
447 | die(_("--pathspec-from-file is incompatible with --interactive/--patch")); | |
b4bd4668 | 448 | exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive)); |
bebb5d6d | 449 | } |
90a6bb98 JS |
450 | if (legacy_stash_p) { |
451 | struct pathspec pathspec; | |
452 | ||
453 | parse_pathspec(&pathspec, 0, | |
454 | PATHSPEC_PREFER_FULL | | |
455 | PATHSPEC_SYMLINK_LEADING_PATH | | |
456 | PATHSPEC_PREFIX_ORIGIN, | |
457 | prefix, argv); | |
458 | ||
459 | return run_add_interactive(NULL, "--patch=stash", &pathspec); | |
460 | } | |
0d781539 | 461 | |
bebb5d6d AM |
462 | if (edit_interactive) { |
463 | if (pathspec_from_file) | |
464 | die(_("--pathspec-from-file is incompatible with --edit")); | |
c59cb03a | 465 | return(edit_patch(argc, argv, prefix)); |
bebb5d6d | 466 | } |
c59cb03a JS |
467 | argc--; |
468 | argv++; | |
469 | ||
45c45e30 JH |
470 | if (0 <= addremove_explicit) |
471 | addremove = addremove_explicit; | |
472 | else if (take_worktree_changes && ADDREMOVE_DEFAULT) | |
473 | addremove = 0; /* "-u" was given but not "-A" */ | |
474 | ||
3ba1f114 | 475 | if (addremove && take_worktree_changes) |
990ac4be | 476 | die(_("-A and -u are mutually incompatible")); |
45c45e30 | 477 | |
108da0db | 478 | if (!show_only && ignore_missing) |
990ac4be | 479 | die(_("Option --ignore-missing can only be used together with --dry-run")); |
808d3d71 | 480 | |
610d55af TG |
481 | if (chmod_arg && ((chmod_arg[0] != '-' && chmod_arg[0] != '+') || |
482 | chmod_arg[1] != 'x' || chmod_arg[2])) | |
4e55ed32 ET |
483 | die(_("--chmod param '%s' must be either -x or +x"), chmod_arg); |
484 | ||
9472935d | 485 | add_new_files = !take_worktree_changes && !refresh_only && !add_renormalize; |
29abb339 | 486 | require_pathspec = !(take_worktree_changes || (0 < addremove_explicit)); |
c972ec04 | 487 | |
b3e83cc7 | 488 | hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); |
0d781539 | 489 | |
5a76aff1 NTND |
490 | /* |
491 | * Check the "pathspec '%s' did not match any files" block | |
492 | * below before enabling new magic. | |
493 | */ | |
84d938b7 | 494 | parse_pathspec(&pathspec, PATHSPEC_ATTR, |
5a76aff1 | 495 | PATHSPEC_PREFER_FULL | |
c08397e3 | 496 | PATHSPEC_SYMLINK_LEADING_PATH, |
5a76aff1 | 497 | prefix, argv); |
366bfcb6 | 498 | |
bebb5d6d AM |
499 | if (pathspec_from_file) { |
500 | if (pathspec.nr) | |
501 | die(_("--pathspec-from-file is incompatible with pathspec arguments")); | |
502 | ||
503 | parse_pathspec_file(&pathspec, PATHSPEC_ATTR, | |
504 | PATHSPEC_PREFER_FULL | | |
505 | PATHSPEC_SYMLINK_LEADING_PATH, | |
506 | prefix, pathspec_from_file, pathspec_file_nul); | |
507 | } else if (pathspec_file_nul) { | |
508 | die(_("--pathspec-file-nul requires --pathspec-from-file")); | |
509 | } | |
510 | ||
511 | if (require_pathspec && pathspec.nr == 0) { | |
21bb3083 | 512 | fprintf(stderr, _("Nothing specified, nothing added.\n")); |
887a0fd5 HW |
513 | if (advice_add_empty_pathspec) |
514 | advise( _("Maybe you wanted to say 'git add .'?\n" | |
515 | "Turn this message off by running\n" | |
516 | "\"git config advice.addEmptyPathspec false\"")); | |
21bb3083 AM |
517 | return 0; |
518 | } | |
519 | ||
bebb5d6d | 520 | if (!take_worktree_changes && addremove_explicit < 0 && pathspec.nr) |
21bb3083 AM |
521 | /* Turn "git add pathspec..." to "git add -A pathspec..." */ |
522 | addremove = 1; | |
523 | ||
524 | flags = ((verbose ? ADD_CACHE_VERBOSE : 0) | | |
525 | (show_only ? ADD_CACHE_PRETEND : 0) | | |
526 | (intent_to_add ? ADD_CACHE_INTENT : 0) | | |
527 | (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) | | |
528 | (!(addremove || take_worktree_changes) | |
529 | ? ADD_CACHE_IGNORE_REMOVAL : 0)); | |
530 | ||
d1664e73 BP |
531 | if (read_cache_preload(&pathspec) < 0) |
532 | die(_("index file corrupt")); | |
533 | ||
534 | die_in_unpopulated_submodule(&the_index, prefix); | |
c08397e3 BW |
535 | die_path_inside_submodule(&the_index, &pathspec); |
536 | ||
1d8842d9 LT |
537 | if (add_new_files) { |
538 | int baselen; | |
539 | ||
540 | /* Set up the default git porcelain excludes */ | |
541 | memset(&dir, 0, sizeof(dir)); | |
542 | if (!ignored_too) { | |
543 | dir.flags |= DIR_COLLECT_IGNORED; | |
544 | setup_standard_excludes(&dir); | |
545 | } | |
546 | ||
1e5f764c | 547 | /* This picks up the paths that are not tracked */ |
0d32c183 | 548 | baselen = fill_directory(&dir, &the_index, &pathspec); |
5a76aff1 | 549 | if (pathspec.nr) |
053a6b18 | 550 | seen = prune_directory(&dir, &pathspec, baselen); |
1d8842d9 | 551 | } |
1e5f764c | 552 | |
c972ec04 | 553 | if (refresh_only) { |
9b2d6149 | 554 | refresh(verbose, &pathspec); |
c972ec04 | 555 | goto finish; |
6a1ad325 JH |
556 | } |
557 | ||
5a76aff1 | 558 | if (pathspec.nr) { |
81f45e7d | 559 | int i; |
eb69934b | 560 | |
81f45e7d | 561 | if (!seen) |
08de9151 | 562 | seen = find_pathspecs_matching_against_index(&pathspec, &the_index); |
5a76aff1 NTND |
563 | |
564 | /* | |
565 | * file_exists() assumes exact match | |
566 | */ | |
bd30c2e4 NTND |
567 | GUARD_PATHSPEC(&pathspec, |
568 | PATHSPEC_FROMTOP | | |
569 | PATHSPEC_LITERAL | | |
93d93537 | 570 | PATHSPEC_GLOB | |
ef79b1f8 NTND |
571 | PATHSPEC_ICASE | |
572 | PATHSPEC_EXCLUDE); | |
5a76aff1 | 573 | |
84b8b5d1 NTND |
574 | for (i = 0; i < pathspec.nr; i++) { |
575 | const char *path = pathspec.items[i].match; | |
ef79b1f8 NTND |
576 | if (pathspec.items[i].magic & PATHSPEC_EXCLUDE) |
577 | continue; | |
64ed07ce | 578 | if (!seen[i] && path[0] && |
93d93537 NTND |
579 | ((pathspec.items[i].magic & |
580 | (PATHSPEC_GLOB | PATHSPEC_ICASE)) || | |
bd30c2e4 | 581 | !file_exists(path))) { |
108da0db | 582 | if (ignore_missing) { |
0188f6b3 | 583 | int dtype = DT_UNKNOWN; |
a0bba65b | 584 | if (is_excluded(&dir, &the_index, path, &dtype)) |
9e58beca BW |
585 | dir_add_ignored(&dir, &the_index, |
586 | path, pathspec.items[i].len); | |
108da0db | 587 | } else |
48168851 | 588 | die(_("pathspec '%s' did not match any files"), |
84b8b5d1 | 589 | pathspec.items[i].original); |
108da0db | 590 | } |
81f45e7d JH |
591 | } |
592 | free(seen); | |
593 | } | |
594 | ||
568508e7 JH |
595 | plug_bulk_checkin(); |
596 | ||
9472935d TB |
597 | if (add_renormalize) |
598 | exit_status |= renormalize_tracked_files(&pathspec, flags); | |
599 | else | |
600 | exit_status |= add_files_to_cache(prefix, &pathspec, flags); | |
c972ec04 JH |
601 | |
602 | if (add_new_files) | |
610d55af | 603 | exit_status |= add_files(&dir, flags); |
0d781539 | 604 | |
610d55af TG |
605 | if (chmod_arg && pathspec.nr) |
606 | chmod_pathspec(&pathspec, chmod_arg[0]); | |
568508e7 JH |
607 | unplug_bulk_checkin(); |
608 | ||
d521abf8 | 609 | finish: |
61000814 MÅ |
610 | if (write_locked_index(&the_index, &lock_file, |
611 | COMMIT_LOCK | SKIP_IF_UNCHANGED)) | |
612 | die(_("Unable to write new index file")); | |
0d781539 | 613 | |
0e5bba53 JK |
614 | UNLEAK(pathspec); |
615 | UNLEAK(dir); | |
7ae02a30 | 616 | return exit_status; |
0d781539 | 617 | } |