builtin/add.c

   1 /*
   2  * "git add" builtin command
   3  *
   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"
  16
  17 static const char * const builtin_add_usage[] = {
  18         "git add [options] [--] <filepattern>...",
  19         NULL
  20 };
  21 static int patch_interactive, add_interactive, edit_interactive;
  22 static int take_worktree_changes;
  23
  24 struct update_callback_data {
  25         int flags;
  26         int add_errors;
  27 };
  28
  29 static int fix_unmerged_status(struct diff_filepair *p,
  30                                struct update_callback_data *data)
  31 {
  32         if (p->status != DIFF_STATUS_UNMERGED)
  33                 return p->status;
  34         if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL) && !p->two->mode)
  35                 /*
  36                  * This is not an explicit add request, and the
  37                  * path is missing from the working tree (deleted)
  38                  */
  39                 return DIFF_STATUS_DELETED;
  40         else
  41                 /*
  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.
  46                  */
  47                 return DIFF_STATUS_MODIFIED;
  48 }
  49
  50 static void update_callback(struct diff_queue_struct *q,
  51                             struct diff_options *opt, void *cbdata)
  52 {
  53         int i;
  54         struct update_callback_data *data = cbdata;
  55
  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++;
  68                         }
  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;
  78                 }
  79         }
  80 }
  81
  82 int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
  83 {
  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;
  97 }
  98
  99 static void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
 100 {
 101         int num_unmatched = 0, i;
 102
 103         /*
 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.
 108          */
 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);
 117         }
 118 }
 119
 120 static char *find_used_pathspec(const char **pathspec)
 121 {
 122         char *seen;
 123         int i;
 124
 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;
 130 }
 131
 132 static char *prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
 133 {
 134         char *seen;
 135         int i, specs;
 136         struct dir_entry **src, **dst;
 137
 138         for (specs = 0; pathspec[specs];  specs++)
 139                 /* nothing */;
 140         seen = xcalloc(specs, 1);
 141
 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;
 149         }
 150         dir->nr = dst - dir->entries;
 151         fill_pathspec_matches(pathspec, seen, specs);
 152         return seen;
 153 }
 154
 155 static void treat_gitlinks(const char **pathspec)
 156 {
 157         int i;
 158
 159         if (!pathspec || !*pathspec)
 160                 return;
 161
 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);
 177                         }
 178                 }
 179         }
 180 }
 181
 182 static void refresh(int verbose, const char **pathspec)
 183 {
 184         char *seen;
 185         int i, specs;
 186
 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]);
 195         }
 196         free(seen);
 197 }
 198
 199 static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
 200 {
 201         const char **pathspec = get_pathspec(prefix, argv);
 202
 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);
 209                         }
 210                 }
 211         }
 212
 213         return pathspec;
 214 }
 215
 216 int run_add_interactive(const char *revision, const char *patch_mode,
 217                         const char **pathspec)
 218 {
 219         int status, ac, pc = 0;
 220         const char **args;
 221
 222         if (pathspec)
 223                 while (pathspec[pc])
 224                         pc++;
 225
 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;
 237         }
 238         args[ac] = NULL;
 239
 240         status = run_command_v_opt(args, RUN_GIT_CMD);
 241         free(args);
 242         return status;
 243 }
 244
 245 int interactive_add(int argc, const char **argv, const char *prefix)
 246 {
 247         const char **pathspec = NULL;
 248
 249         if (argc) {
 250                 pathspec = validate_pathspec(argc, argv, prefix);
 251                 if (!pathspec)
 252                         return -1;
 253         }
 254
 255         return run_add_interactive(NULL,
 256                                    patch_interactive ? "--patch" : NULL,
 257                                    pathspec);
 258 }
 259
 260 static int edit_patch(int argc, const char **argv, const char *prefix)
 261 {
 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;
 269
 270         apply_argv[3] = file;
 271
 272         git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 273
 274         if (read_cache() < 0)
 275                 die (_("Could not read the index"));
 276
 277         init_revisions(&rev, prefix);
 278         rev.diffopt.context = 7;
 279
 280         argc = setup_revisions(argc, argv, &rev, NULL);
 281         rev.diffopt.output_format = DIFF_FORMAT_PATCH;
 282         out = open(file, O_CREAT | O_WRONLY, 0644);
 283         if (out < 0)
 284                 die (_("Could not open '%s' for writing."), file);
 285         rev.diffopt.file = xfdopen(out, "w");
 286         rev.diffopt.close_file = 1;
 287         if (run_diff_files(&rev, 0))
 288                 die (_("Could not write patch"));
 289
 290         launch_editor(file, NULL, NULL);
 291
 292         if (stat(file, &st))
 293                 die_errno(_("Could not stat '%s'"), file);
 294         if (!st.st_size)
 295                 die(_("Empty patch. Aborted."));
 296
 297         memset(&child, 0, sizeof(child));
 298         child.git_cmd = 1;
 299         child.argv = apply_argv;
 300         if (run_command(&child))
 301                 die (_("Could not apply '%s'"), file);
 302
 303         unlink(file);
 304         return 0;
 305 }
 306
 307 static struct lock_file lock_file;
 308
 309 static const char ignore_error[] =
 310 N_("The following paths are ignored by one of your .gitignore files:\n");
 311
 312 static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
 313 static int ignore_add_errors, addremove, intent_to_add, ignore_missing = 0;
 314
 315 static struct option builtin_add_options[] = {
 316         OPT__DRY_RUN(&show_only, "dry run"),
 317         OPT__VERBOSE(&verbose, "be verbose"),
 318         OPT_GROUP(""),
 319         OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
 320         OPT_BOOLEAN('p', "patch", &patch_interactive, "select hunks interactively"),
 321         OPT_BOOLEAN('e', "edit", &edit_interactive, "edit current diff and apply"),
 322         OPT__FORCE(&ignored_too, "allow adding otherwise ignored files"),
 323         OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
 324         OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"),
 325         OPT_BOOLEAN('A', "all", &addremove, "add changes from all tracked and untracked files"),
 326         OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
 327         OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
 328         OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, "check if - even missing - files are ignored in dry run"),
 329         OPT_END(),
 330 };
 331
 332 static int add_config(const char *var, const char *value, void *cb)
 333 {
 334         if (!strcmp(var, "add.ignoreerrors") ||
 335             !strcmp(var, "add.ignore-errors")) {
 336                 ignore_add_errors = git_config_bool(var, value);
 337                 return 0;
 338         }
 339         return git_default_config(var, value, cb);
 340 }
 341
 342 static int add_files(struct dir_struct *dir, int flags)
 343 {
 344         int i, exit_status = 0;
 345
 346         if (dir->ignored_nr) {
 347                 fprintf(stderr, _(ignore_error));
 348                 for (i = 0; i < dir->ignored_nr; i++)
 349                         fprintf(stderr, "%s\n", dir->ignored[i]->name);
 350                 fprintf(stderr, _("Use -f if you really want to add them.\n"));
 351                 die(_("no files added"));
 352         }
 353
 354         for (i = 0; i < dir->nr; i++)
 355                 if (add_file_to_cache(dir->entries[i]->name, flags)) {
 356                         if (!ignore_add_errors)
 357                                 die(_("adding files failed"));
 358                         exit_status = 1;
 359                 }
 360         return exit_status;
 361 }
 362
 363 int cmd_add(int argc, const char **argv, const char *prefix)
 364 {
 365         int exit_status = 0;
 366         int newfd;
 367         const char **pathspec;
 368         struct dir_struct dir;
 369         int flags;
 370         int add_new_files;
 371         int require_pathspec;
 372         char *seen = NULL;
 373
 374         git_config(add_config, NULL);
 375
 376         argc = parse_options(argc, argv, prefix, builtin_add_options,
 377                           builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
 378         if (patch_interactive)
 379                 add_interactive = 1;
 380         if (add_interactive)
 381                 exit(interactive_add(argc - 1, argv + 1, prefix));
 382
 383         if (edit_interactive)
 384                 return(edit_patch(argc, argv, prefix));
 385         argc--;
 386         argv++;
 387
 388         if (addremove && take_worktree_changes)
 389                 die(_("-A and -u are mutually incompatible"));
 390         if (!show_only && ignore_missing)
 391                 die(_("Option --ignore-missing can only be used together with --dry-run"));
 392         if ((addremove || take_worktree_changes) && !argc) {
 393                 static const char *here[2] = { ".", NULL };
 394                 argc = 1;
 395                 argv = here;
 396         }
 397
 398         add_new_files = !take_worktree_changes && !refresh_only;
 399         require_pathspec = !take_worktree_changes;
 400
 401         newfd = hold_locked_index(&lock_file, 1);
 402
 403         flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
 404                  (show_only ? ADD_CACHE_PRETEND : 0) |
 405                  (intent_to_add ? ADD_CACHE_INTENT : 0) |
 406                  (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
 407                  (!(addremove || take_worktree_changes)
 408                   ? ADD_CACHE_IGNORE_REMOVAL : 0));
 409
 410         if (require_pathspec && argc == 0) {
 411                 fprintf(stderr, _("Nothing specified, nothing added.\n"));
 412                 fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n"));
 413                 return 0;
 414         }
 415         pathspec = validate_pathspec(argc, argv, prefix);
 416
 417         if (read_cache() < 0)
 418                 die(_("index file corrupt"));
 419         treat_gitlinks(pathspec);
 420
 421         if (add_new_files) {
 422                 int baselen;
 423
 424                 /* Set up the default git porcelain excludes */
 425                 memset(&dir, 0, sizeof(dir));
 426                 if (!ignored_too) {
 427                         dir.flags |= DIR_COLLECT_IGNORED;
 428                         setup_standard_excludes(&dir);
 429                 }
 430
 431                 /* This picks up the paths that are not tracked */
 432                 baselen = fill_directory(&dir, pathspec);
 433                 if (pathspec)
 434                         seen = prune_directory(&dir, pathspec, baselen);
 435         }
 436
 437         if (refresh_only) {
 438                 refresh(verbose, pathspec);
 439                 goto finish;
 440         }
 441
 442         if (pathspec) {
 443                 int i;
 444                 if (!seen)
 445                         seen = find_used_pathspec(pathspec);
 446                 for (i = 0; pathspec[i]; i++) {
 447                         if (!seen[i] && pathspec[i][0]
 448                             && !file_exists(pathspec[i])) {
 449                                 if (ignore_missing) {
 450                                         int dtype = DT_UNKNOWN;
 451                                         if (excluded(&dir, pathspec[i], &dtype))
 452                                                 dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i]));
 453                                 } else
 454                                         die(_("pathspec '%s' did not match any files"),
 455                                             pathspec[i]);
 456                         }
 457                 }
 458                 free(seen);
 459         }
 460
 461         exit_status |= add_files_to_cache(prefix, pathspec, flags);
 462
 463         if (add_new_files)
 464                 exit_status |= add_files(&dir, flags);
 465
 466  finish:
 467         if (active_cache_changed) {
 468                 if (write_cache(newfd, active_cache, active_nr) ||
 469                     commit_locked_index(&lock_file))
 470                         die(_("Unable to write new index file"));
 471         }
 472
 473         return exit_status;
 474 }