submodule: Use cat instead of echo to avoid DOS line-endings
[git/dscho.git] / builtin / add.c
blob68fd050e94586b15ac720e415f8026ef2f62f7d1
1 /*
2 * "git add" builtin command
4 * Copyright (C) 2006 Linus Torvalds
5 */
6 #include "cache.h"
7 #include "builtin.h"
8 #include "dir.h"
9 #include "exec_cmd.h"
10 #include "cache-tree.h"
11 #include "run-command.h"
12 #include "parse-options.h"
13 #include "diff.h"
14 #include "diffcore.h"
15 #include "revision.h"
17 static const char * const builtin_add_usage[] = {
18 "git add [options] [--] <filepattern>...",
19 NULL
21 static int patch_interactive, add_interactive, edit_interactive;
22 static int take_worktree_changes;
24 struct update_callback_data {
25 int flags;
26 int add_errors;
29 static int fix_unmerged_status(struct diff_filepair *p,
30 struct update_callback_data *data)
32 if (p->status != DIFF_STATUS_UNMERGED)
33 return p->status;
34 if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL) && !p->two->mode)
36 * This is not an explicit add request, and the
37 * path is missing from the working tree (deleted)
39 return DIFF_STATUS_DELETED;
40 else
42 * Either an explicit add request, or path exists
43 * in the working tree. An attempt to explicitly
44 * add a path that does not exist in the working tree
45 * will be caught as an error by the caller immediately.
47 return DIFF_STATUS_MODIFIED;
50 static void update_callback(struct diff_queue_struct *q,
51 struct diff_options *opt, void *cbdata)
53 int i;
54 struct update_callback_data *data = cbdata;
56 for (i = 0; i < q->nr; i++) {
57 struct diff_filepair *p = q->queue[i];
58 const char *path = p->one->path;
59 switch (fix_unmerged_status(p, data)) {
60 default:
61 die(_("unexpected diff status %c"), p->status);
62 case DIFF_STATUS_MODIFIED:
63 case DIFF_STATUS_TYPE_CHANGED:
64 if (add_file_to_index(&the_index, path, data->flags)) {
65 if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
66 die(_("updating files failed"));
67 data->add_errors++;
69 break;
70 case DIFF_STATUS_DELETED:
71 if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
72 break;
73 if (!(data->flags & ADD_CACHE_PRETEND))
74 remove_file_from_index(&the_index, path);
75 if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
76 printf(_("remove '%s'\n"), path);
77 break;
82 int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
84 struct update_callback_data data;
85 struct rev_info rev;
86 init_revisions(&rev, prefix);
87 setup_revisions(0, NULL, &rev, NULL);
88 init_pathspec(&rev.prune_data, pathspec);
89 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
90 rev.diffopt.format_callback = update_callback;
91 data.flags = flags;
92 data.add_errors = 0;
93 rev.diffopt.format_callback_data = &data;
94 rev.max_count = 0; /* do not compare unmerged paths with stage #2 */
95 run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
96 return !!data.add_errors;
99 static void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
101 int num_unmatched = 0, i;
104 * Since we are walking the index as if we were walking the directory,
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.
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);
120 static char *find_used_pathspec(const char **pathspec)
122 char *seen;
123 int i;
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;
132 static char *prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
134 char *seen;
135 int i, specs;
136 struct dir_entry **src, **dst;
138 for (specs = 0; pathspec[specs]; specs++)
139 /* nothing */;
140 seen = xcalloc(specs, 1);
142 src = dst = dir->entries;
143 i = dir->nr;
144 while (--i >= 0) {
145 struct dir_entry *entry = *src++;
146 if (match_pathspec(pathspec, entry->name, entry->len,
147 prefix, seen))
148 *dst++ = entry;
150 dir->nr = dst - dir->entries;
151 fill_pathspec_matches(pathspec, seen, specs);
152 return seen;
155 static void treat_gitlinks(const char **pathspec)
157 int i;
159 if (!pathspec || !*pathspec)
160 return;
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);
182 static void refresh(int verbose, const char **pathspec)
184 char *seen;
185 int i, specs;
187 for (specs = 0; pathspec[specs]; specs++)
188 /* nothing */;
189 seen = xcalloc(specs, 1);
190 refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET,
191 pathspec, seen, _("Unstaged changes after refreshing the index:"));
192 for (i = 0; i < specs; i++) {
193 if (!seen[i])
194 die(_("pathspec '%s' did not match any files"), pathspec[i]);
196 free(seen);
199 static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
201 const char **pathspec = get_pathspec(prefix, argv);
203 if (pathspec) {
204 const char **p;
205 for (p = pathspec; *p; p++) {
206 if (has_symlink_leading_path(*p, strlen(*p))) {
207 int len = prefix ? strlen(prefix) : 0;
208 die(_("'%s' is beyond a symbolic link"), *p + len);
213 return pathspec;
216 int run_add_interactive(const char *revision, const char *patch_mode,
217 const char **pathspec)
219 int status, ac, pc = 0;
220 const char **args;
222 if (pathspec)
223 while (pathspec[pc])
224 pc++;
226 args = xcalloc(sizeof(const char *), (pc + 5));
227 ac = 0;
228 args[ac++] = "add--interactive";
229 if (patch_mode)
230 args[ac++] = patch_mode;
231 if (revision)
232 args[ac++] = revision;
233 args[ac++] = "--";
234 if (pc) {
235 memcpy(&(args[ac]), pathspec, sizeof(const char *) * pc);
236 ac += pc;
238 args[ac] = NULL;
240 status = run_command_v_opt(args, RUN_GIT_CMD);
241 free(args);
242 return status;
245 int interactive_add(int argc, const char **argv, const char *prefix, int patch)
247 const char **pathspec = NULL;
249 if (argc) {
250 pathspec = validate_pathspec(argc, argv, prefix);
251 if (!pathspec)
252 return -1;
255 return run_add_interactive(NULL,
256 patch ? "--patch" : NULL,
257 pathspec);
260 static int edit_patch(int argc, const char **argv, const char *prefix)
262 char *file = xstrdup(git_path("ADD_EDIT.patch"));
263 const char *apply_argv[] = { "apply", "--recount", "--cached",
264 NULL, NULL };
265 struct child_process child;
266 struct rev_info rev;
267 int out;
268 struct stat st;
270 apply_argv[3] = file;
272 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
274 if (read_cache() < 0)
275 die (_("Could not read the index"));
277 init_revisions(&rev, prefix);
278 rev.diffopt.context = 7;
280 argc = setup_revisions(argc, argv, &rev, NULL);
281 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
282 DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES);
283 out = open(file, O_CREAT | O_WRONLY, 0644);
284 if (out < 0)
285 die (_("Could not open '%s' for writing."), file);
286 rev.diffopt.file = xfdopen(out, "w");
287 rev.diffopt.close_file = 1;
288 if (run_diff_files(&rev, 0))
289 die (_("Could not write patch"));
291 launch_editor(file, NULL, NULL);
293 if (stat(file, &st))
294 die_errno(_("Could not stat '%s'"), file);
295 if (!st.st_size)
296 die(_("Empty patch. Aborted."));
298 memset(&child, 0, sizeof(child));
299 child.git_cmd = 1;
300 child.argv = apply_argv;
301 if (run_command(&child))
302 die (_("Could not apply '%s'"), file);
304 unlink(file);
305 return 0;
308 static struct lock_file lock_file;
310 static const char ignore_error[] =
311 N_("The following paths are ignored by one of your .gitignore files:\n");
313 static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
314 static int ignore_add_errors, addremove, intent_to_add, ignore_missing = 0;
316 static struct option builtin_add_options[] = {
317 OPT__DRY_RUN(&show_only, "dry run"),
318 OPT__VERBOSE(&verbose, "be verbose"),
319 OPT_GROUP(""),
320 OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
321 OPT_BOOLEAN('p', "patch", &patch_interactive, "select hunks interactively"),
322 OPT_BOOLEAN('e', "edit", &edit_interactive, "edit current diff and apply"),
323 OPT__FORCE(&ignored_too, "allow adding otherwise ignored files"),
324 OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
325 OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"),
326 OPT_BOOLEAN('A', "all", &addremove, "add changes from all tracked and untracked files"),
327 OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
328 OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
329 OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, "check if - even missing - files are ignored in dry run"),
330 OPT_END(),
333 static int add_config(const char *var, const char *value, void *cb)
335 if (!strcmp(var, "add.ignoreerrors") ||
336 !strcmp(var, "add.ignore-errors")) {
337 ignore_add_errors = git_config_bool(var, value);
338 return 0;
340 return git_default_config(var, value, cb);
343 static int add_files(struct dir_struct *dir, int flags)
345 int i, exit_status = 0;
347 if (dir->ignored_nr) {
348 fprintf(stderr, _(ignore_error));
349 for (i = 0; i < dir->ignored_nr; i++)
350 fprintf(stderr, "%s\n", dir->ignored[i]->name);
351 fprintf(stderr, _("Use -f if you really want to add them.\n"));
352 die(_("no files added"));
355 for (i = 0; i < dir->nr; i++)
356 if (add_file_to_cache(dir->entries[i]->name, flags)) {
357 if (!ignore_add_errors)
358 die(_("adding files failed"));
359 exit_status = 1;
361 return exit_status;
364 int cmd_add(int argc, const char **argv, const char *prefix)
366 int exit_status = 0;
367 int newfd;
368 const char **pathspec;
369 struct dir_struct dir;
370 int flags;
371 int add_new_files;
372 int require_pathspec;
373 char *seen = NULL;
375 git_config(add_config, NULL);
377 argc = parse_options(argc, argv, prefix, builtin_add_options,
378 builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
379 if (patch_interactive)
380 add_interactive = 1;
381 if (add_interactive)
382 exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive));
384 if (edit_interactive)
385 return(edit_patch(argc, argv, prefix));
386 argc--;
387 argv++;
389 if (addremove && take_worktree_changes)
390 die(_("-A and -u are mutually incompatible"));
391 if (!show_only && ignore_missing)
392 die(_("Option --ignore-missing can only be used together with --dry-run"));
393 if ((addremove || take_worktree_changes) && !argc) {
394 static const char *here[2] = { ".", NULL };
395 argc = 1;
396 argv = here;
399 add_new_files = !take_worktree_changes && !refresh_only;
400 require_pathspec = !take_worktree_changes;
402 newfd = hold_locked_index(&lock_file, 1);
404 flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
405 (show_only ? ADD_CACHE_PRETEND : 0) |
406 (intent_to_add ? ADD_CACHE_INTENT : 0) |
407 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
408 (!(addremove || take_worktree_changes)
409 ? ADD_CACHE_IGNORE_REMOVAL : 0));
411 if (require_pathspec && argc == 0) {
412 fprintf(stderr, _("Nothing specified, nothing added.\n"));
413 fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n"));
414 return 0;
416 pathspec = validate_pathspec(argc, argv, prefix);
418 if (read_cache() < 0)
419 die(_("index file corrupt"));
420 treat_gitlinks(pathspec);
422 if (add_new_files) {
423 int baselen;
425 /* Set up the default git porcelain excludes */
426 memset(&dir, 0, sizeof(dir));
427 if (!ignored_too) {
428 dir.flags |= DIR_COLLECT_IGNORED;
429 setup_standard_excludes(&dir);
432 /* This picks up the paths that are not tracked */
433 baselen = fill_directory(&dir, pathspec);
434 if (pathspec)
435 seen = prune_directory(&dir, pathspec, baselen);
438 if (refresh_only) {
439 refresh(verbose, pathspec);
440 goto finish;
443 if (pathspec) {
444 int i;
445 if (!seen)
446 seen = find_used_pathspec(pathspec);
447 for (i = 0; pathspec[i]; i++) {
448 if (!seen[i] && pathspec[i][0]
449 && !file_exists(pathspec[i])) {
450 if (ignore_missing) {
451 int dtype = DT_UNKNOWN;
452 if (excluded(&dir, pathspec[i], &dtype))
453 dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i]));
454 } else
455 die(_("pathspec '%s' did not match any files"),
456 pathspec[i]);
459 free(seen);
462 exit_status |= add_files_to_cache(prefix, pathspec, flags);
464 if (add_new_files)
465 exit_status |= add_files(&dir, flags);
467 finish:
468 if (active_cache_changed) {
469 if (write_cache(newfd, active_cache, active_nr) ||
470 commit_locked_index(&lock_file))
471 die(_("Unable to write new index file"));
474 return exit_status;