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