repo-settings: parse core.untrackedCache
[git/git.git] / builtin / update-index.c
1 /*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
6 #define USE_THE_INDEX_COMPATIBILITY_MACROS
7 #include "cache.h"
8 #include "config.h"
9 #include "lockfile.h"
10 #include "quote.h"
11 #include "cache-tree.h"
12 #include "tree-walk.h"
13 #include "builtin.h"
14 #include "refs.h"
15 #include "resolve-undo.h"
16 #include "parse-options.h"
17 #include "pathspec.h"
18 #include "dir.h"
19 #include "split-index.h"
20 #include "fsmonitor.h"
21
22 /*
23 * Default to not allowing changes to the list of files. The
24 * tool doesn't actually care, but this makes it harder to add
25 * files to the revision control by mistake by doing something
26 * like "git update-index *" and suddenly having all the object
27 * files be revision controlled.
28 */
29 static int allow_add;
30 static int allow_remove;
31 static int allow_replace;
32 static int info_only;
33 static int force_remove;
34 static int verbose;
35 static int mark_valid_only;
36 static int mark_skip_worktree_only;
37 static int mark_fsmonitor_only;
38 #define MARK_FLAG 1
39 #define UNMARK_FLAG 2
40 static struct strbuf mtime_dir = STRBUF_INIT;
41
42 /* Untracked cache mode */
43 enum uc_mode {
44 UC_UNSPECIFIED = -1,
45 UC_DISABLE = 0,
46 UC_ENABLE,
47 UC_TEST,
48 UC_FORCE
49 };
50
51 __attribute__((format (printf, 1, 2)))
52 static void report(const char *fmt, ...)
53 {
54 va_list vp;
55
56 if (!verbose)
57 return;
58
59 va_start(vp, fmt);
60 vprintf(fmt, vp);
61 putchar('\n');
62 va_end(vp);
63 }
64
65 static void remove_test_directory(void)
66 {
67 if (mtime_dir.len)
68 remove_dir_recursively(&mtime_dir, 0);
69 }
70
71 static const char *get_mtime_path(const char *path)
72 {
73 static struct strbuf sb = STRBUF_INIT;
74 strbuf_reset(&sb);
75 strbuf_addf(&sb, "%s/%s", mtime_dir.buf, path);
76 return sb.buf;
77 }
78
79 static void xmkdir(const char *path)
80 {
81 path = get_mtime_path(path);
82 if (mkdir(path, 0700))
83 die_errno(_("failed to create directory %s"), path);
84 }
85
86 static int xstat_mtime_dir(struct stat *st)
87 {
88 if (stat(mtime_dir.buf, st))
89 die_errno(_("failed to stat %s"), mtime_dir.buf);
90 return 0;
91 }
92
93 static int create_file(const char *path)
94 {
95 int fd;
96 path = get_mtime_path(path);
97 fd = open(path, O_CREAT | O_RDWR, 0644);
98 if (fd < 0)
99 die_errno(_("failed to create file %s"), path);
100 return fd;
101 }
102
103 static void xunlink(const char *path)
104 {
105 path = get_mtime_path(path);
106 if (unlink(path))
107 die_errno(_("failed to delete file %s"), path);
108 }
109
110 static void xrmdir(const char *path)
111 {
112 path = get_mtime_path(path);
113 if (rmdir(path))
114 die_errno(_("failed to delete directory %s"), path);
115 }
116
117 static void avoid_racy(void)
118 {
119 /*
120 * not use if we could usleep(10) if USE_NSEC is defined. The
121 * field nsec could be there, but the OS could choose to
122 * ignore it?
123 */
124 sleep(1);
125 }
126
127 static int test_if_untracked_cache_is_supported(void)
128 {
129 struct stat st;
130 struct stat_data base;
131 int fd, ret = 0;
132 char *cwd;
133
134 strbuf_addstr(&mtime_dir, "mtime-test-XXXXXX");
135 if (!mkdtemp(mtime_dir.buf))
136 die_errno("Could not make temporary directory");
137
138 cwd = xgetcwd();
139 fprintf(stderr, _("Testing mtime in '%s' "), cwd);
140 free(cwd);
141
142 atexit(remove_test_directory);
143 xstat_mtime_dir(&st);
144 fill_stat_data(&base, &st);
145 fputc('.', stderr);
146
147 avoid_racy();
148 fd = create_file("newfile");
149 xstat_mtime_dir(&st);
150 if (!match_stat_data(&base, &st)) {
151 close(fd);
152 fputc('\n', stderr);
153 fprintf_ln(stderr,_("directory stat info does not "
154 "change after adding a new file"));
155 goto done;
156 }
157 fill_stat_data(&base, &st);
158 fputc('.', stderr);
159
160 avoid_racy();
161 xmkdir("new-dir");
162 xstat_mtime_dir(&st);
163 if (!match_stat_data(&base, &st)) {
164 close(fd);
165 fputc('\n', stderr);
166 fprintf_ln(stderr, _("directory stat info does not change "
167 "after adding a new directory"));
168 goto done;
169 }
170 fill_stat_data(&base, &st);
171 fputc('.', stderr);
172
173 avoid_racy();
174 write_or_die(fd, "data", 4);
175 close(fd);
176 xstat_mtime_dir(&st);
177 if (match_stat_data(&base, &st)) {
178 fputc('\n', stderr);
179 fprintf_ln(stderr, _("directory stat info changes "
180 "after updating a file"));
181 goto done;
182 }
183 fputc('.', stderr);
184
185 avoid_racy();
186 close(create_file("new-dir/new"));
187 xstat_mtime_dir(&st);
188 if (match_stat_data(&base, &st)) {
189 fputc('\n', stderr);
190 fprintf_ln(stderr, _("directory stat info changes after "
191 "adding a file inside subdirectory"));
192 goto done;
193 }
194 fputc('.', stderr);
195
196 avoid_racy();
197 xunlink("newfile");
198 xstat_mtime_dir(&st);
199 if (!match_stat_data(&base, &st)) {
200 fputc('\n', stderr);
201 fprintf_ln(stderr, _("directory stat info does not "
202 "change after deleting a file"));
203 goto done;
204 }
205 fill_stat_data(&base, &st);
206 fputc('.', stderr);
207
208 avoid_racy();
209 xunlink("new-dir/new");
210 xrmdir("new-dir");
211 xstat_mtime_dir(&st);
212 if (!match_stat_data(&base, &st)) {
213 fputc('\n', stderr);
214 fprintf_ln(stderr, _("directory stat info does not "
215 "change after deleting a directory"));
216 goto done;
217 }
218
219 if (rmdir(mtime_dir.buf))
220 die_errno(_("failed to delete directory %s"), mtime_dir.buf);
221 fprintf_ln(stderr, _(" OK"));
222 ret = 1;
223
224 done:
225 strbuf_release(&mtime_dir);
226 return ret;
227 }
228
229 static int mark_ce_flags(const char *path, int flag, int mark)
230 {
231 int namelen = strlen(path);
232 int pos = cache_name_pos(path, namelen);
233 if (0 <= pos) {
234 mark_fsmonitor_invalid(&the_index, active_cache[pos]);
235 if (mark)
236 active_cache[pos]->ce_flags |= flag;
237 else
238 active_cache[pos]->ce_flags &= ~flag;
239 active_cache[pos]->ce_flags |= CE_UPDATE_IN_BASE;
240 cache_tree_invalidate_path(&the_index, path);
241 active_cache_changed |= CE_ENTRY_CHANGED;
242 return 0;
243 }
244 return -1;
245 }
246
247 static int remove_one_path(const char *path)
248 {
249 if (!allow_remove)
250 return error("%s: does not exist and --remove not passed", path);
251 if (remove_file_from_cache(path))
252 return error("%s: cannot remove from the index", path);
253 return 0;
254 }
255
256 /*
257 * Handle a path that couldn't be lstat'ed. It's either:
258 * - missing file (ENOENT or ENOTDIR). That's ok if we're
259 * supposed to be removing it and the removal actually
260 * succeeds.
261 * - permission error. That's never ok.
262 */
263 static int process_lstat_error(const char *path, int err)
264 {
265 if (is_missing_file_error(err))
266 return remove_one_path(path);
267 return error("lstat(\"%s\"): %s", path, strerror(err));
268 }
269
270 static int add_one_path(const struct cache_entry *old, const char *path, int len, struct stat *st)
271 {
272 int option;
273 struct cache_entry *ce;
274
275 /* Was the old index entry already up-to-date? */
276 if (old && !ce_stage(old) && !ce_match_stat(old, st, 0))
277 return 0;
278
279 ce = make_empty_cache_entry(&the_index, len);
280 memcpy(ce->name, path, len);
281 ce->ce_flags = create_ce_flags(0);
282 ce->ce_namelen = len;
283 fill_stat_cache_info(&the_index, ce, st);
284 ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
285
286 if (index_path(&the_index, &ce->oid, path, st,
287 info_only ? 0 : HASH_WRITE_OBJECT)) {
288 discard_cache_entry(ce);
289 return -1;
290 }
291 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
292 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
293 if (add_cache_entry(ce, option)) {
294 discard_cache_entry(ce);
295 return error("%s: cannot add to the index - missing --add option?", path);
296 }
297 return 0;
298 }
299
300 /*
301 * Handle a path that was a directory. Four cases:
302 *
303 * - it's already a gitlink in the index, and we keep it that
304 * way, and update it if we can (if we cannot find the HEAD,
305 * we're going to keep it unchanged in the index!)
306 *
307 * - it's a *file* in the index, in which case it should be
308 * removed as a file if removal is allowed, since it doesn't
309 * exist as such any more. If removal isn't allowed, it's
310 * an error.
311 *
312 * (NOTE! This is old and arguably fairly strange behaviour.
313 * We might want to make this an error unconditionally, and
314 * use "--force-remove" if you actually want to force removal).
315 *
316 * - it used to exist as a subdirectory (ie multiple files with
317 * this particular prefix) in the index, in which case it's wrong
318 * to try to update it as a directory.
319 *
320 * - it doesn't exist at all in the index, but it is a valid
321 * git directory, and it should be *added* as a gitlink.
322 */
323 static int process_directory(const char *path, int len, struct stat *st)
324 {
325 struct object_id oid;
326 int pos = cache_name_pos(path, len);
327
328 /* Exact match: file or existing gitlink */
329 if (pos >= 0) {
330 const struct cache_entry *ce = active_cache[pos];
331 if (S_ISGITLINK(ce->ce_mode)) {
332
333 /* Do nothing to the index if there is no HEAD! */
334 if (resolve_gitlink_ref(path, "HEAD", &oid) < 0)
335 return 0;
336
337 return add_one_path(ce, path, len, st);
338 }
339 /* Should this be an unconditional error? */
340 return remove_one_path(path);
341 }
342
343 /* Inexact match: is there perhaps a subdirectory match? */
344 pos = -pos-1;
345 while (pos < active_nr) {
346 const struct cache_entry *ce = active_cache[pos++];
347
348 if (strncmp(ce->name, path, len))
349 break;
350 if (ce->name[len] > '/')
351 break;
352 if (ce->name[len] < '/')
353 continue;
354
355 /* Subdirectory match - error out */
356 return error("%s: is a directory - add individual files instead", path);
357 }
358
359 /* No match - should we add it as a gitlink? */
360 if (!resolve_gitlink_ref(path, "HEAD", &oid))
361 return add_one_path(NULL, path, len, st);
362
363 /* Error out. */
364 return error("%s: is a directory - add files inside instead", path);
365 }
366
367 static int process_path(const char *path, struct stat *st, int stat_errno)
368 {
369 int pos, len;
370 const struct cache_entry *ce;
371
372 len = strlen(path);
373 if (has_symlink_leading_path(path, len))
374 return error("'%s' is beyond a symbolic link", path);
375
376 pos = cache_name_pos(path, len);
377 ce = pos < 0 ? NULL : active_cache[pos];
378 if (ce && ce_skip_worktree(ce)) {
379 /*
380 * working directory version is assumed "good"
381 * so updating it does not make sense.
382 * On the other hand, removing it from index should work
383 */
384 if (allow_remove && remove_file_from_cache(path))
385 return error("%s: cannot remove from the index", path);
386 return 0;
387 }
388
389 /*
390 * First things first: get the stat information, to decide
391 * what to do about the pathname!
392 */
393 if (stat_errno)
394 return process_lstat_error(path, stat_errno);
395
396 if (S_ISDIR(st->st_mode))
397 return process_directory(path, len, st);
398
399 return add_one_path(ce, path, len, st);
400 }
401
402 static int add_cacheinfo(unsigned int mode, const struct object_id *oid,
403 const char *path, int stage)
404 {
405 int len, option;
406 struct cache_entry *ce;
407
408 if (!verify_path(path, mode))
409 return error("Invalid path '%s'", path);
410
411 len = strlen(path);
412 ce = make_empty_cache_entry(&the_index, len);
413
414 oidcpy(&ce->oid, oid);
415 memcpy(ce->name, path, len);
416 ce->ce_flags = create_ce_flags(stage);
417 ce->ce_namelen = len;
418 ce->ce_mode = create_ce_mode(mode);
419 if (assume_unchanged)
420 ce->ce_flags |= CE_VALID;
421 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
422 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
423 if (add_cache_entry(ce, option))
424 return error("%s: cannot add to the index - missing --add option?",
425 path);
426 report("add '%s'", path);
427 return 0;
428 }
429
430 static void chmod_path(char flip, const char *path)
431 {
432 int pos;
433 struct cache_entry *ce;
434
435 pos = cache_name_pos(path, strlen(path));
436 if (pos < 0)
437 goto fail;
438 ce = active_cache[pos];
439 if (chmod_cache_entry(ce, flip) < 0)
440 goto fail;
441
442 report("chmod %cx '%s'", flip, path);
443 return;
444 fail:
445 die("git update-index: cannot chmod %cx '%s'", flip, path);
446 }
447
448 static void update_one(const char *path)
449 {
450 int stat_errno = 0;
451 struct stat st;
452
453 if (mark_valid_only || mark_skip_worktree_only || force_remove ||
454 mark_fsmonitor_only)
455 st.st_mode = 0;
456 else if (lstat(path, &st) < 0) {
457 st.st_mode = 0;
458 stat_errno = errno;
459 } /* else stat is valid */
460
461 if (!verify_path(path, st.st_mode)) {
462 fprintf(stderr, "Ignoring path %s\n", path);
463 return;
464 }
465 if (mark_valid_only) {
466 if (mark_ce_flags(path, CE_VALID, mark_valid_only == MARK_FLAG))
467 die("Unable to mark file %s", path);
468 return;
469 }
470 if (mark_skip_worktree_only) {
471 if (mark_ce_flags(path, CE_SKIP_WORKTREE, mark_skip_worktree_only == MARK_FLAG))
472 die("Unable to mark file %s", path);
473 return;
474 }
475 if (mark_fsmonitor_only) {
476 if (mark_ce_flags(path, CE_FSMONITOR_VALID, mark_fsmonitor_only == MARK_FLAG))
477 die("Unable to mark file %s", path);
478 return;
479 }
480
481 if (force_remove) {
482 if (remove_file_from_cache(path))
483 die("git update-index: unable to remove %s", path);
484 report("remove '%s'", path);
485 return;
486 }
487 if (process_path(path, &st, stat_errno))
488 die("Unable to process path %s", path);
489 report("add '%s'", path);
490 }
491
492 static void read_index_info(int nul_term_line)
493 {
494 const int hexsz = the_hash_algo->hexsz;
495 struct strbuf buf = STRBUF_INIT;
496 struct strbuf uq = STRBUF_INIT;
497 strbuf_getline_fn getline_fn;
498
499 getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
500 while (getline_fn(&buf, stdin) != EOF) {
501 char *ptr, *tab;
502 char *path_name;
503 struct object_id oid;
504 unsigned int mode;
505 unsigned long ul;
506 int stage;
507
508 /* This reads lines formatted in one of three formats:
509 *
510 * (1) mode SP sha1 TAB path
511 * The first format is what "git apply --index-info"
512 * reports, and used to reconstruct a partial tree
513 * that is used for phony merge base tree when falling
514 * back on 3-way merge.
515 *
516 * (2) mode SP type SP sha1 TAB path
517 * The second format is to stuff "git ls-tree" output
518 * into the index file.
519 *
520 * (3) mode SP sha1 SP stage TAB path
521 * This format is to put higher order stages into the
522 * index file and matches "git ls-files --stage" output.
523 */
524 errno = 0;
525 ul = strtoul(buf.buf, &ptr, 8);
526 if (ptr == buf.buf || *ptr != ' '
527 || errno || (unsigned int) ul != ul)
528 goto bad_line;
529 mode = ul;
530
531 tab = strchr(ptr, '\t');
532 if (!tab || tab - ptr < hexsz + 1)
533 goto bad_line;
534
535 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
536 stage = tab[-1] - '0';
537 ptr = tab + 1; /* point at the head of path */
538 tab = tab - 2; /* point at tail of sha1 */
539 }
540 else {
541 stage = 0;
542 ptr = tab + 1; /* point at the head of path */
543 }
544
545 if (get_oid_hex(tab - hexsz, &oid) ||
546 tab[-(hexsz + 1)] != ' ')
547 goto bad_line;
548
549 path_name = ptr;
550 if (!nul_term_line && path_name[0] == '"') {
551 strbuf_reset(&uq);
552 if (unquote_c_style(&uq, path_name, NULL)) {
553 die("git update-index: bad quoting of path name");
554 }
555 path_name = uq.buf;
556 }
557
558 if (!verify_path(path_name, mode)) {
559 fprintf(stderr, "Ignoring path %s\n", path_name);
560 continue;
561 }
562
563 if (!mode) {
564 /* mode == 0 means there is no such path -- remove */
565 if (remove_file_from_cache(path_name))
566 die("git update-index: unable to remove %s",
567 ptr);
568 }
569 else {
570 /* mode ' ' sha1 '\t' name
571 * ptr[-1] points at tab,
572 * ptr[-41] is at the beginning of sha1
573 */
574 ptr[-(hexsz + 2)] = ptr[-1] = 0;
575 if (add_cacheinfo(mode, &oid, path_name, stage))
576 die("git update-index: unable to update %s",
577 path_name);
578 }
579 continue;
580
581 bad_line:
582 die("malformed index info %s", buf.buf);
583 }
584 strbuf_release(&buf);
585 strbuf_release(&uq);
586 }
587
588 static const char * const update_index_usage[] = {
589 N_("git update-index [<options>] [--] [<file>...]"),
590 NULL
591 };
592
593 static struct object_id head_oid;
594 static struct object_id merge_head_oid;
595
596 static struct cache_entry *read_one_ent(const char *which,
597 struct object_id *ent, const char *path,
598 int namelen, int stage)
599 {
600 unsigned short mode;
601 struct object_id oid;
602 struct cache_entry *ce;
603
604 if (get_tree_entry(the_repository, ent, path, &oid, &mode)) {
605 if (which)
606 error("%s: not in %s branch.", path, which);
607 return NULL;
608 }
609 if (mode == S_IFDIR) {
610 if (which)
611 error("%s: not a blob in %s branch.", path, which);
612 return NULL;
613 }
614 ce = make_empty_cache_entry(&the_index, namelen);
615
616 oidcpy(&ce->oid, &oid);
617 memcpy(ce->name, path, namelen);
618 ce->ce_flags = create_ce_flags(stage);
619 ce->ce_namelen = namelen;
620 ce->ce_mode = create_ce_mode(mode);
621 return ce;
622 }
623
624 static int unresolve_one(const char *path)
625 {
626 int namelen = strlen(path);
627 int pos;
628 int ret = 0;
629 struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
630
631 /* See if there is such entry in the index. */
632 pos = cache_name_pos(path, namelen);
633 if (0 <= pos) {
634 /* already merged */
635 pos = unmerge_cache_entry_at(pos);
636 if (pos < active_nr) {
637 const struct cache_entry *ce = active_cache[pos];
638 if (ce_stage(ce) &&
639 ce_namelen(ce) == namelen &&
640 !memcmp(ce->name, path, namelen))
641 return 0;
642 }
643 /* no resolve-undo information; fall back */
644 } else {
645 /* If there isn't, either it is unmerged, or
646 * resolved as "removed" by mistake. We do not
647 * want to do anything in the former case.
648 */
649 pos = -pos-1;
650 if (pos < active_nr) {
651 const struct cache_entry *ce = active_cache[pos];
652 if (ce_namelen(ce) == namelen &&
653 !memcmp(ce->name, path, namelen)) {
654 fprintf(stderr,
655 "%s: skipping still unmerged path.\n",
656 path);
657 goto free_return;
658 }
659 }
660 }
661
662 /* Grab blobs from given path from HEAD and MERGE_HEAD,
663 * stuff HEAD version in stage #2,
664 * stuff MERGE_HEAD version in stage #3.
665 */
666 ce_2 = read_one_ent("our", &head_oid, path, namelen, 2);
667 ce_3 = read_one_ent("their", &merge_head_oid, path, namelen, 3);
668
669 if (!ce_2 || !ce_3) {
670 ret = -1;
671 goto free_return;
672 }
673 if (oideq(&ce_2->oid, &ce_3->oid) &&
674 ce_2->ce_mode == ce_3->ce_mode) {
675 fprintf(stderr, "%s: identical in both, skipping.\n",
676 path);
677 goto free_return;
678 }
679
680 remove_file_from_cache(path);
681 if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
682 error("%s: cannot add our version to the index.", path);
683 ret = -1;
684 goto free_return;
685 }
686 if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
687 return 0;
688 error("%s: cannot add their version to the index.", path);
689 ret = -1;
690 free_return:
691 discard_cache_entry(ce_2);
692 discard_cache_entry(ce_3);
693 return ret;
694 }
695
696 static void read_head_pointers(void)
697 {
698 if (read_ref("HEAD", &head_oid))
699 die("No HEAD -- no initial commit yet?");
700 if (read_ref("MERGE_HEAD", &merge_head_oid)) {
701 fprintf(stderr, "Not in the middle of a merge.\n");
702 exit(0);
703 }
704 }
705
706 static int do_unresolve(int ac, const char **av,
707 const char *prefix, int prefix_length)
708 {
709 int i;
710 int err = 0;
711
712 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
713 * are not doing a merge, so exit with success status.
714 */
715 read_head_pointers();
716
717 for (i = 1; i < ac; i++) {
718 const char *arg = av[i];
719 char *p = prefix_path(prefix, prefix_length, arg);
720 err |= unresolve_one(p);
721 free(p);
722 }
723 return err;
724 }
725
726 static int do_reupdate(int ac, const char **av,
727 const char *prefix)
728 {
729 /* Read HEAD and run update-index on paths that are
730 * merged and already different between index and HEAD.
731 */
732 int pos;
733 int has_head = 1;
734 struct pathspec pathspec;
735
736 parse_pathspec(&pathspec, 0,
737 PATHSPEC_PREFER_CWD,
738 prefix, av + 1);
739
740 if (read_ref("HEAD", &head_oid))
741 /* If there is no HEAD, that means it is an initial
742 * commit. Update everything in the index.
743 */
744 has_head = 0;
745 redo:
746 for (pos = 0; pos < active_nr; pos++) {
747 const struct cache_entry *ce = active_cache[pos];
748 struct cache_entry *old = NULL;
749 int save_nr;
750 char *path;
751
752 if (ce_stage(ce) || !ce_path_match(&the_index, ce, &pathspec, NULL))
753 continue;
754 if (has_head)
755 old = read_one_ent(NULL, &head_oid,
756 ce->name, ce_namelen(ce), 0);
757 if (old && ce->ce_mode == old->ce_mode &&
758 oideq(&ce->oid, &old->oid)) {
759 discard_cache_entry(old);
760 continue; /* unchanged */
761 }
762 /* Be careful. The working tree may not have the
763 * path anymore, in which case, under 'allow_remove',
764 * or worse yet 'allow_replace', active_nr may decrease.
765 */
766 save_nr = active_nr;
767 path = xstrdup(ce->name);
768 update_one(path);
769 free(path);
770 discard_cache_entry(old);
771 if (save_nr != active_nr)
772 goto redo;
773 }
774 clear_pathspec(&pathspec);
775 return 0;
776 }
777
778 struct refresh_params {
779 unsigned int flags;
780 int *has_errors;
781 };
782
783 static int refresh(struct refresh_params *o, unsigned int flag)
784 {
785 setup_work_tree();
786 read_cache();
787 *o->has_errors |= refresh_cache(o->flags | flag);
788 return 0;
789 }
790
791 static int refresh_callback(const struct option *opt,
792 const char *arg, int unset)
793 {
794 BUG_ON_OPT_NEG(unset);
795 BUG_ON_OPT_ARG(arg);
796 return refresh(opt->value, 0);
797 }
798
799 static int really_refresh_callback(const struct option *opt,
800 const char *arg, int unset)
801 {
802 BUG_ON_OPT_NEG(unset);
803 BUG_ON_OPT_ARG(arg);
804 return refresh(opt->value, REFRESH_REALLY);
805 }
806
807 static int chmod_callback(const struct option *opt,
808 const char *arg, int unset)
809 {
810 char *flip = opt->value;
811 BUG_ON_OPT_NEG(unset);
812 if ((arg[0] != '-' && arg[0] != '+') || arg[1] != 'x' || arg[2])
813 return error("option 'chmod' expects \"+x\" or \"-x\"");
814 *flip = arg[0];
815 return 0;
816 }
817
818 static int resolve_undo_clear_callback(const struct option *opt,
819 const char *arg, int unset)
820 {
821 BUG_ON_OPT_NEG(unset);
822 BUG_ON_OPT_ARG(arg);
823 resolve_undo_clear();
824 return 0;
825 }
826
827 static int parse_new_style_cacheinfo(const char *arg,
828 unsigned int *mode,
829 struct object_id *oid,
830 const char **path)
831 {
832 unsigned long ul;
833 char *endp;
834 const char *p;
835
836 if (!arg)
837 return -1;
838
839 errno = 0;
840 ul = strtoul(arg, &endp, 8);
841 if (errno || endp == arg || *endp != ',' || (unsigned int) ul != ul)
842 return -1; /* not a new-style cacheinfo */
843 *mode = ul;
844 endp++;
845 if (parse_oid_hex(endp, oid, &p) || *p != ',')
846 return -1;
847 *path = p + 1;
848 return 0;
849 }
850
851 static enum parse_opt_result cacheinfo_callback(
852 struct parse_opt_ctx_t *ctx, const struct option *opt,
853 const char *arg, int unset)
854 {
855 struct object_id oid;
856 unsigned int mode;
857 const char *path;
858
859 BUG_ON_OPT_NEG(unset);
860 BUG_ON_OPT_ARG(arg);
861
862 if (!parse_new_style_cacheinfo(ctx->argv[1], &mode, &oid, &path)) {
863 if (add_cacheinfo(mode, &oid, path, 0))
864 die("git update-index: --cacheinfo cannot add %s", path);
865 ctx->argv++;
866 ctx->argc--;
867 return 0;
868 }
869 if (ctx->argc <= 3)
870 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
871 if (strtoul_ui(*++ctx->argv, 8, &mode) ||
872 get_oid_hex(*++ctx->argv, &oid) ||
873 add_cacheinfo(mode, &oid, *++ctx->argv, 0))
874 die("git update-index: --cacheinfo cannot add %s", *ctx->argv);
875 ctx->argc -= 3;
876 return 0;
877 }
878
879 static enum parse_opt_result stdin_cacheinfo_callback(
880 struct parse_opt_ctx_t *ctx, const struct option *opt,
881 const char *arg, int unset)
882 {
883 int *nul_term_line = opt->value;
884
885 BUG_ON_OPT_NEG(unset);
886 BUG_ON_OPT_ARG(arg);
887
888 if (ctx->argc != 1)
889 return error("option '%s' must be the last argument", opt->long_name);
890 allow_add = allow_replace = allow_remove = 1;
891 read_index_info(*nul_term_line);
892 return 0;
893 }
894
895 static enum parse_opt_result stdin_callback(
896 struct parse_opt_ctx_t *ctx, const struct option *opt,
897 const char *arg, int unset)
898 {
899 int *read_from_stdin = opt->value;
900
901 BUG_ON_OPT_NEG(unset);
902 BUG_ON_OPT_ARG(arg);
903
904 if (ctx->argc != 1)
905 return error("option '%s' must be the last argument", opt->long_name);
906 *read_from_stdin = 1;
907 return 0;
908 }
909
910 static enum parse_opt_result unresolve_callback(
911 struct parse_opt_ctx_t *ctx, const struct option *opt,
912 const char *arg, int unset)
913 {
914 int *has_errors = opt->value;
915 const char *prefix = startup_info->prefix;
916
917 BUG_ON_OPT_NEG(unset);
918 BUG_ON_OPT_ARG(arg);
919
920 /* consume remaining arguments. */
921 *has_errors = do_unresolve(ctx->argc, ctx->argv,
922 prefix, prefix ? strlen(prefix) : 0);
923 if (*has_errors)
924 active_cache_changed = 0;
925
926 ctx->argv += ctx->argc - 1;
927 ctx->argc = 1;
928 return 0;
929 }
930
931 static enum parse_opt_result reupdate_callback(
932 struct parse_opt_ctx_t *ctx, const struct option *opt,
933 const char *arg, int unset)
934 {
935 int *has_errors = opt->value;
936 const char *prefix = startup_info->prefix;
937
938 BUG_ON_OPT_NEG(unset);
939 BUG_ON_OPT_ARG(arg);
940
941 /* consume remaining arguments. */
942 setup_work_tree();
943 *has_errors = do_reupdate(ctx->argc, ctx->argv, prefix);
944 if (*has_errors)
945 active_cache_changed = 0;
946
947 ctx->argv += ctx->argc - 1;
948 ctx->argc = 1;
949 return 0;
950 }
951
952 int cmd_update_index(int argc, const char **argv, const char *prefix)
953 {
954 int newfd, entries, has_errors = 0, nul_term_line = 0;
955 enum uc_mode untracked_cache = UC_UNSPECIFIED;
956 int read_from_stdin = 0;
957 int prefix_length = prefix ? strlen(prefix) : 0;
958 int preferred_index_format = 0;
959 char set_executable_bit = 0;
960 struct refresh_params refresh_args = {0, &has_errors};
961 int lock_error = 0;
962 int split_index = -1;
963 int force_write = 0;
964 int fsmonitor = -1;
965 struct lock_file lock_file = LOCK_INIT;
966 struct parse_opt_ctx_t ctx;
967 strbuf_getline_fn getline_fn;
968 int parseopt_state = PARSE_OPT_UNKNOWN;
969 struct repository *r = the_repository;
970 struct option options[] = {
971 OPT_BIT('q', NULL, &refresh_args.flags,
972 N_("continue refresh even when index needs update"),
973 REFRESH_QUIET),
974 OPT_BIT(0, "ignore-submodules", &refresh_args.flags,
975 N_("refresh: ignore submodules"),
976 REFRESH_IGNORE_SUBMODULES),
977 OPT_SET_INT(0, "add", &allow_add,
978 N_("do not ignore new files"), 1),
979 OPT_SET_INT(0, "replace", &allow_replace,
980 N_("let files replace directories and vice-versa"), 1),
981 OPT_SET_INT(0, "remove", &allow_remove,
982 N_("notice files missing from worktree"), 1),
983 OPT_BIT(0, "unmerged", &refresh_args.flags,
984 N_("refresh even if index contains unmerged entries"),
985 REFRESH_UNMERGED),
986 {OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL,
987 N_("refresh stat information"),
988 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
989 refresh_callback},
990 {OPTION_CALLBACK, 0, "really-refresh", &refresh_args, NULL,
991 N_("like --refresh, but ignore assume-unchanged setting"),
992 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
993 really_refresh_callback},
994 {OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
995 N_("<mode>,<object>,<path>"),
996 N_("add the specified entry to the index"),
997 PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
998 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
999 NULL, 0,
1000 cacheinfo_callback},
1001 {OPTION_CALLBACK, 0, "chmod", &set_executable_bit, "(+|-)x",
1002 N_("override the executable bit of the listed files"),
1003 PARSE_OPT_NONEG,
1004 chmod_callback},
1005 {OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
1006 N_("mark files as \"not changing\""),
1007 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
1008 {OPTION_SET_INT, 0, "no-assume-unchanged", &mark_valid_only, NULL,
1009 N_("clear assumed-unchanged bit"),
1010 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
1011 {OPTION_SET_INT, 0, "skip-worktree", &mark_skip_worktree_only, NULL,
1012 N_("mark files as \"index-only\""),
1013 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
1014 {OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
1015 N_("clear skip-worktree bit"),
1016 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
1017 OPT_SET_INT(0, "info-only", &info_only,
1018 N_("add to index only; do not add content to object database"), 1),
1019 OPT_SET_INT(0, "force-remove", &force_remove,
1020 N_("remove named paths even if present in worktree"), 1),
1021 OPT_BOOL('z', NULL, &nul_term_line,
1022 N_("with --stdin: input lines are terminated by null bytes")),
1023 {OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
1024 N_("read list of paths to be updated from standard input"),
1025 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1026 NULL, 0, stdin_callback},
1027 {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &nul_term_line, NULL,
1028 N_("add entries from standard input to the index"),
1029 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1030 NULL, 0, stdin_cacheinfo_callback},
1031 {OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
1032 N_("repopulate stages #2 and #3 for the listed paths"),
1033 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1034 NULL, 0, unresolve_callback},
1035 {OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
1036 N_("only update entries that differ from HEAD"),
1037 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1038 NULL, 0, reupdate_callback},
1039 OPT_BIT(0, "ignore-missing", &refresh_args.flags,
1040 N_("ignore files missing from worktree"),
1041 REFRESH_IGNORE_MISSING),
1042 OPT_SET_INT(0, "verbose", &verbose,
1043 N_("report actions to standard output"), 1),
1044 {OPTION_CALLBACK, 0, "clear-resolve-undo", NULL, NULL,
1045 N_("(for porcelains) forget saved unresolved conflicts"),
1046 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1047 resolve_undo_clear_callback},
1048 OPT_INTEGER(0, "index-version", &preferred_index_format,
1049 N_("write index in this format")),
1050 OPT_BOOL(0, "split-index", &split_index,
1051 N_("enable or disable split index")),
1052 OPT_BOOL(0, "untracked-cache", &untracked_cache,
1053 N_("enable/disable untracked cache")),
1054 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache,
1055 N_("test if the filesystem supports untracked cache"), UC_TEST),
1056 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache,
1057 N_("enable untracked cache without testing the filesystem"), UC_FORCE),
1058 OPT_SET_INT(0, "force-write-index", &force_write,
1059 N_("write out the index even if is not flagged as changed"), 1),
1060 OPT_BOOL(0, "fsmonitor", &fsmonitor,
1061 N_("enable or disable file system monitor")),
1062 {OPTION_SET_INT, 0, "fsmonitor-valid", &mark_fsmonitor_only, NULL,
1063 N_("mark files as fsmonitor valid"),
1064 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
1065 {OPTION_SET_INT, 0, "no-fsmonitor-valid", &mark_fsmonitor_only, NULL,
1066 N_("clear fsmonitor valid bit"),
1067 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
1068 OPT_END()
1069 };
1070
1071 if (argc == 2 && !strcmp(argv[1], "-h"))
1072 usage_with_options(update_index_usage, options);
1073
1074 git_config(git_default_config, NULL);
1075
1076 /* we will diagnose later if it turns out that we need to update it */
1077 newfd = hold_locked_index(&lock_file, 0);
1078 if (newfd < 0)
1079 lock_error = errno;
1080
1081 entries = read_cache();
1082 if (entries < 0)
1083 die("cache corrupted");
1084
1085 the_index.updated_skipworktree = 1;
1086
1087 /*
1088 * Custom copy of parse_options() because we want to handle
1089 * filename arguments as they come.
1090 */
1091 parse_options_start(&ctx, argc, argv, prefix,
1092 options, PARSE_OPT_STOP_AT_NON_OPTION);
1093 while (ctx.argc) {
1094 if (parseopt_state != PARSE_OPT_DONE)
1095 parseopt_state = parse_options_step(&ctx, options,
1096 update_index_usage);
1097 if (!ctx.argc)
1098 break;
1099 switch (parseopt_state) {
1100 case PARSE_OPT_HELP:
1101 case PARSE_OPT_ERROR:
1102 exit(129);
1103 case PARSE_OPT_COMPLETE:
1104 exit(0);
1105 case PARSE_OPT_NON_OPTION:
1106 case PARSE_OPT_DONE:
1107 {
1108 const char *path = ctx.argv[0];
1109 char *p;
1110
1111 setup_work_tree();
1112 p = prefix_path(prefix, prefix_length, path);
1113 update_one(p);
1114 if (set_executable_bit)
1115 chmod_path(set_executable_bit, p);
1116 free(p);
1117 ctx.argc--;
1118 ctx.argv++;
1119 break;
1120 }
1121 case PARSE_OPT_UNKNOWN:
1122 if (ctx.argv[0][1] == '-')
1123 error("unknown option '%s'", ctx.argv[0] + 2);
1124 else
1125 error("unknown switch '%c'", *ctx.opt);
1126 usage_with_options(update_index_usage, options);
1127 }
1128 }
1129 argc = parse_options_end(&ctx);
1130
1131 getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
1132 if (preferred_index_format) {
1133 if (preferred_index_format < INDEX_FORMAT_LB ||
1134 INDEX_FORMAT_UB < preferred_index_format)
1135 die("index-version %d not in range: %d..%d",
1136 preferred_index_format,
1137 INDEX_FORMAT_LB, INDEX_FORMAT_UB);
1138
1139 if (the_index.version != preferred_index_format)
1140 active_cache_changed |= SOMETHING_CHANGED;
1141 the_index.version = preferred_index_format;
1142 }
1143
1144 if (read_from_stdin) {
1145 struct strbuf buf = STRBUF_INIT;
1146 struct strbuf unquoted = STRBUF_INIT;
1147
1148 setup_work_tree();
1149 while (getline_fn(&buf, stdin) != EOF) {
1150 char *p;
1151 if (!nul_term_line && buf.buf[0] == '"') {
1152 strbuf_reset(&unquoted);
1153 if (unquote_c_style(&unquoted, buf.buf, NULL))
1154 die("line is badly quoted");
1155 strbuf_swap(&buf, &unquoted);
1156 }
1157 p = prefix_path(prefix, prefix_length, buf.buf);
1158 update_one(p);
1159 if (set_executable_bit)
1160 chmod_path(set_executable_bit, p);
1161 free(p);
1162 }
1163 strbuf_release(&unquoted);
1164 strbuf_release(&buf);
1165 }
1166
1167 if (split_index > 0) {
1168 if (git_config_get_split_index() == 0)
1169 warning(_("core.splitIndex is set to false; "
1170 "remove or change it, if you really want to "
1171 "enable split index"));
1172 if (the_index.split_index)
1173 the_index.cache_changed |= SPLIT_INDEX_ORDERED;
1174 else
1175 add_split_index(&the_index);
1176 } else if (!split_index) {
1177 if (git_config_get_split_index() == 1)
1178 warning(_("core.splitIndex is set to true; "
1179 "remove or change it, if you really want to "
1180 "disable split index"));
1181 remove_split_index(&the_index);
1182 }
1183
1184 prepare_repo_settings(r);
1185 switch (untracked_cache) {
1186 case UC_UNSPECIFIED:
1187 break;
1188 case UC_DISABLE:
1189 if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)
1190 warning(_("core.untrackedCache is set to true; "
1191 "remove or change it, if you really want to "
1192 "disable the untracked cache"));
1193 remove_untracked_cache(&the_index);
1194 report(_("Untracked cache disabled"));
1195 break;
1196 case UC_TEST:
1197 setup_work_tree();
1198 return !test_if_untracked_cache_is_supported();
1199 case UC_ENABLE:
1200 case UC_FORCE:
1201 if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE)
1202 warning(_("core.untrackedCache is set to false; "
1203 "remove or change it, if you really want to "
1204 "enable the untracked cache"));
1205 add_untracked_cache(&the_index);
1206 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1207 break;
1208 default:
1209 BUG("bad untracked_cache value: %d", untracked_cache);
1210 }
1211
1212 if (fsmonitor > 0) {
1213 if (git_config_get_fsmonitor() == 0)
1214 warning(_("core.fsmonitor is unset; "
1215 "set it if you really want to "
1216 "enable fsmonitor"));
1217 add_fsmonitor(&the_index);
1218 report(_("fsmonitor enabled"));
1219 } else if (!fsmonitor) {
1220 if (git_config_get_fsmonitor() == 1)
1221 warning(_("core.fsmonitor is set; "
1222 "remove it if you really want to "
1223 "disable fsmonitor"));
1224 remove_fsmonitor(&the_index);
1225 report(_("fsmonitor disabled"));
1226 }
1227
1228 if (active_cache_changed || force_write) {
1229 if (newfd < 0) {
1230 if (refresh_args.flags & REFRESH_QUIET)
1231 exit(128);
1232 unable_to_lock_die(get_index_file(), lock_error);
1233 }
1234 if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
1235 die("Unable to write new index file");
1236 }
1237
1238 rollback_lock_file(&lock_file);
1239
1240 return has_errors ? 1 : 0;
1241 }