]> git.ipfire.org Git - thirdparty/git.git/blob - builtin/update-index.c
update-index: reduce scope of index expansion in do_reupdate
[thirdparty/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 static int ignore_skip_worktree_entries;
39 #define MARK_FLAG 1
40 #define UNMARK_FLAG 2
41 static struct strbuf mtime_dir = STRBUF_INIT;
42
43 /* Untracked cache mode */
44 enum uc_mode {
45 UC_UNSPECIFIED = -1,
46 UC_DISABLE = 0,
47 UC_ENABLE,
48 UC_TEST,
49 UC_FORCE
50 };
51
52 __attribute__((format (printf, 1, 2)))
53 static void report(const char *fmt, ...)
54 {
55 va_list vp;
56
57 if (!verbose)
58 return;
59
60 va_start(vp, fmt);
61 vprintf(fmt, vp);
62 putchar('\n');
63 va_end(vp);
64 }
65
66 static void remove_test_directory(void)
67 {
68 if (mtime_dir.len)
69 remove_dir_recursively(&mtime_dir, 0);
70 }
71
72 static const char *get_mtime_path(const char *path)
73 {
74 static struct strbuf sb = STRBUF_INIT;
75 strbuf_reset(&sb);
76 strbuf_addf(&sb, "%s/%s", mtime_dir.buf, path);
77 return sb.buf;
78 }
79
80 static void xmkdir(const char *path)
81 {
82 path = get_mtime_path(path);
83 if (mkdir(path, 0700))
84 die_errno(_("failed to create directory %s"), path);
85 }
86
87 static int xstat_mtime_dir(struct stat *st)
88 {
89 if (stat(mtime_dir.buf, st))
90 die_errno(_("failed to stat %s"), mtime_dir.buf);
91 return 0;
92 }
93
94 static int create_file(const char *path)
95 {
96 int fd;
97 path = get_mtime_path(path);
98 fd = xopen(path, O_CREAT | O_RDWR, 0644);
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(&the_index, ce, st);
283 ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
284
285 if (index_path(&the_index, &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 (!ignore_skip_worktree_entries && allow_remove &&
384 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 (!the_index.sparse_index && 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
763 /* At this point, we know the contents of the sparse directory are
764 * modified with respect to HEAD, so we expand the index and restart
765 * to process each path individually
766 */
767 if (S_ISSPARSEDIR(ce->ce_mode)) {
768 ensure_full_index(&the_index);
769 goto redo;
770 }
771
772 /* Be careful. The working tree may not have the
773 * path anymore, in which case, under 'allow_remove',
774 * or worse yet 'allow_replace', active_nr may decrease.
775 */
776 save_nr = active_nr;
777 path = xstrdup(ce->name);
778 update_one(path);
779 free(path);
780 discard_cache_entry(old);
781 if (save_nr != active_nr)
782 goto redo;
783 }
784 clear_pathspec(&pathspec);
785 return 0;
786 }
787
788 struct refresh_params {
789 unsigned int flags;
790 int *has_errors;
791 };
792
793 static int refresh(struct refresh_params *o, unsigned int flag)
794 {
795 setup_work_tree();
796 read_cache();
797 *o->has_errors |= refresh_cache(o->flags | flag);
798 return 0;
799 }
800
801 static int refresh_callback(const struct option *opt,
802 const char *arg, int unset)
803 {
804 BUG_ON_OPT_NEG(unset);
805 BUG_ON_OPT_ARG(arg);
806 return refresh(opt->value, 0);
807 }
808
809 static int really_refresh_callback(const struct option *opt,
810 const char *arg, int unset)
811 {
812 BUG_ON_OPT_NEG(unset);
813 BUG_ON_OPT_ARG(arg);
814 return refresh(opt->value, REFRESH_REALLY);
815 }
816
817 static int chmod_callback(const struct option *opt,
818 const char *arg, int unset)
819 {
820 char *flip = opt->value;
821 BUG_ON_OPT_NEG(unset);
822 if ((arg[0] != '-' && arg[0] != '+') || arg[1] != 'x' || arg[2])
823 return error("option 'chmod' expects \"+x\" or \"-x\"");
824 *flip = arg[0];
825 return 0;
826 }
827
828 static int resolve_undo_clear_callback(const struct option *opt,
829 const char *arg, int unset)
830 {
831 BUG_ON_OPT_NEG(unset);
832 BUG_ON_OPT_ARG(arg);
833 resolve_undo_clear();
834 return 0;
835 }
836
837 static int parse_new_style_cacheinfo(const char *arg,
838 unsigned int *mode,
839 struct object_id *oid,
840 const char **path)
841 {
842 unsigned long ul;
843 char *endp;
844 const char *p;
845
846 if (!arg)
847 return -1;
848
849 errno = 0;
850 ul = strtoul(arg, &endp, 8);
851 if (errno || endp == arg || *endp != ',' || (unsigned int) ul != ul)
852 return -1; /* not a new-style cacheinfo */
853 *mode = ul;
854 endp++;
855 if (parse_oid_hex(endp, oid, &p) || *p != ',')
856 return -1;
857 *path = p + 1;
858 return 0;
859 }
860
861 static enum parse_opt_result cacheinfo_callback(
862 struct parse_opt_ctx_t *ctx, const struct option *opt,
863 const char *arg, int unset)
864 {
865 struct object_id oid;
866 unsigned int mode;
867 const char *path;
868
869 BUG_ON_OPT_NEG(unset);
870 BUG_ON_OPT_ARG(arg);
871
872 if (!parse_new_style_cacheinfo(ctx->argv[1], &mode, &oid, &path)) {
873 if (add_cacheinfo(mode, &oid, path, 0))
874 die("git update-index: --cacheinfo cannot add %s", path);
875 ctx->argv++;
876 ctx->argc--;
877 return 0;
878 }
879 if (ctx->argc <= 3)
880 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
881 if (strtoul_ui(*++ctx->argv, 8, &mode) ||
882 get_oid_hex(*++ctx->argv, &oid) ||
883 add_cacheinfo(mode, &oid, *++ctx->argv, 0))
884 die("git update-index: --cacheinfo cannot add %s", *ctx->argv);
885 ctx->argc -= 3;
886 return 0;
887 }
888
889 static enum parse_opt_result stdin_cacheinfo_callback(
890 struct parse_opt_ctx_t *ctx, const struct option *opt,
891 const char *arg, int unset)
892 {
893 int *nul_term_line = opt->value;
894
895 BUG_ON_OPT_NEG(unset);
896 BUG_ON_OPT_ARG(arg);
897
898 if (ctx->argc != 1)
899 return error("option '%s' must be the last argument", opt->long_name);
900 allow_add = allow_replace = allow_remove = 1;
901 read_index_info(*nul_term_line);
902 return 0;
903 }
904
905 static enum parse_opt_result stdin_callback(
906 struct parse_opt_ctx_t *ctx, const struct option *opt,
907 const char *arg, int unset)
908 {
909 int *read_from_stdin = opt->value;
910
911 BUG_ON_OPT_NEG(unset);
912 BUG_ON_OPT_ARG(arg);
913
914 if (ctx->argc != 1)
915 return error("option '%s' must be the last argument", opt->long_name);
916 *read_from_stdin = 1;
917 return 0;
918 }
919
920 static enum parse_opt_result unresolve_callback(
921 struct parse_opt_ctx_t *ctx, const struct option *opt,
922 const char *arg, int unset)
923 {
924 int *has_errors = opt->value;
925 const char *prefix = startup_info->prefix;
926
927 BUG_ON_OPT_NEG(unset);
928 BUG_ON_OPT_ARG(arg);
929
930 /* consume remaining arguments. */
931 *has_errors = do_unresolve(ctx->argc, ctx->argv,
932 prefix, prefix ? strlen(prefix) : 0);
933 if (*has_errors)
934 active_cache_changed = 0;
935
936 ctx->argv += ctx->argc - 1;
937 ctx->argc = 1;
938 return 0;
939 }
940
941 static enum parse_opt_result reupdate_callback(
942 struct parse_opt_ctx_t *ctx, const struct option *opt,
943 const char *arg, int unset)
944 {
945 int *has_errors = opt->value;
946 const char *prefix = startup_info->prefix;
947
948 BUG_ON_OPT_NEG(unset);
949 BUG_ON_OPT_ARG(arg);
950
951 /* consume remaining arguments. */
952 setup_work_tree();
953 *has_errors = do_reupdate(ctx->argc, ctx->argv, prefix);
954 if (*has_errors)
955 active_cache_changed = 0;
956
957 ctx->argv += ctx->argc - 1;
958 ctx->argc = 1;
959 return 0;
960 }
961
962 int cmd_update_index(int argc, const char **argv, const char *prefix)
963 {
964 int newfd, entries, has_errors = 0, nul_term_line = 0;
965 enum uc_mode untracked_cache = UC_UNSPECIFIED;
966 int read_from_stdin = 0;
967 int prefix_length = prefix ? strlen(prefix) : 0;
968 int preferred_index_format = 0;
969 char set_executable_bit = 0;
970 struct refresh_params refresh_args = {0, &has_errors};
971 int lock_error = 0;
972 int split_index = -1;
973 int force_write = 0;
974 int fsmonitor = -1;
975 struct lock_file lock_file = LOCK_INIT;
976 struct parse_opt_ctx_t ctx;
977 strbuf_getline_fn getline_fn;
978 int parseopt_state = PARSE_OPT_UNKNOWN;
979 struct repository *r = the_repository;
980 struct option options[] = {
981 OPT_BIT('q', NULL, &refresh_args.flags,
982 N_("continue refresh even when index needs update"),
983 REFRESH_QUIET),
984 OPT_BIT(0, "ignore-submodules", &refresh_args.flags,
985 N_("refresh: ignore submodules"),
986 REFRESH_IGNORE_SUBMODULES),
987 OPT_SET_INT(0, "add", &allow_add,
988 N_("do not ignore new files"), 1),
989 OPT_SET_INT(0, "replace", &allow_replace,
990 N_("let files replace directories and vice-versa"), 1),
991 OPT_SET_INT(0, "remove", &allow_remove,
992 N_("notice files missing from worktree"), 1),
993 OPT_BIT(0, "unmerged", &refresh_args.flags,
994 N_("refresh even if index contains unmerged entries"),
995 REFRESH_UNMERGED),
996 OPT_CALLBACK_F(0, "refresh", &refresh_args, NULL,
997 N_("refresh stat information"),
998 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
999 refresh_callback),
1000 OPT_CALLBACK_F(0, "really-refresh", &refresh_args, NULL,
1001 N_("like --refresh, but ignore assume-unchanged setting"),
1002 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1003 really_refresh_callback),
1004 {OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
1005 N_("<mode>,<object>,<path>"),
1006 N_("add the specified entry to the index"),
1007 PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
1008 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
1009 NULL, 0,
1010 cacheinfo_callback},
1011 OPT_CALLBACK_F(0, "chmod", &set_executable_bit, "(+|-)x",
1012 N_("override the executable bit of the listed files"),
1013 PARSE_OPT_NONEG,
1014 chmod_callback),
1015 {OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
1016 N_("mark files as \"not changing\""),
1017 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
1018 {OPTION_SET_INT, 0, "no-assume-unchanged", &mark_valid_only, NULL,
1019 N_("clear assumed-unchanged bit"),
1020 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
1021 {OPTION_SET_INT, 0, "skip-worktree", &mark_skip_worktree_only, NULL,
1022 N_("mark files as \"index-only\""),
1023 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
1024 {OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
1025 N_("clear skip-worktree bit"),
1026 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
1027 OPT_BOOL(0, "ignore-skip-worktree-entries", &ignore_skip_worktree_entries,
1028 N_("do not touch index-only entries")),
1029 OPT_SET_INT(0, "info-only", &info_only,
1030 N_("add to index only; do not add content to object database"), 1),
1031 OPT_SET_INT(0, "force-remove", &force_remove,
1032 N_("remove named paths even if present in worktree"), 1),
1033 OPT_BOOL('z', NULL, &nul_term_line,
1034 N_("with --stdin: input lines are terminated by null bytes")),
1035 {OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
1036 N_("read list of paths to be updated from standard input"),
1037 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1038 NULL, 0, stdin_callback},
1039 {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &nul_term_line, NULL,
1040 N_("add entries from standard input to the index"),
1041 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1042 NULL, 0, stdin_cacheinfo_callback},
1043 {OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
1044 N_("repopulate stages #2 and #3 for the listed paths"),
1045 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1046 NULL, 0, unresolve_callback},
1047 {OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
1048 N_("only update entries that differ from HEAD"),
1049 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1050 NULL, 0, reupdate_callback},
1051 OPT_BIT(0, "ignore-missing", &refresh_args.flags,
1052 N_("ignore files missing from worktree"),
1053 REFRESH_IGNORE_MISSING),
1054 OPT_SET_INT(0, "verbose", &verbose,
1055 N_("report actions to standard output"), 1),
1056 OPT_CALLBACK_F(0, "clear-resolve-undo", NULL, NULL,
1057 N_("(for porcelains) forget saved unresolved conflicts"),
1058 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1059 resolve_undo_clear_callback),
1060 OPT_INTEGER(0, "index-version", &preferred_index_format,
1061 N_("write index in this format")),
1062 OPT_BOOL(0, "split-index", &split_index,
1063 N_("enable or disable split index")),
1064 OPT_BOOL(0, "untracked-cache", &untracked_cache,
1065 N_("enable/disable untracked cache")),
1066 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache,
1067 N_("test if the filesystem supports untracked cache"), UC_TEST),
1068 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache,
1069 N_("enable untracked cache without testing the filesystem"), UC_FORCE),
1070 OPT_SET_INT(0, "force-write-index", &force_write,
1071 N_("write out the index even if is not flagged as changed"), 1),
1072 OPT_BOOL(0, "fsmonitor", &fsmonitor,
1073 N_("enable or disable file system monitor")),
1074 {OPTION_SET_INT, 0, "fsmonitor-valid", &mark_fsmonitor_only, NULL,
1075 N_("mark files as fsmonitor valid"),
1076 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
1077 {OPTION_SET_INT, 0, "no-fsmonitor-valid", &mark_fsmonitor_only, NULL,
1078 N_("clear fsmonitor valid bit"),
1079 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
1080 OPT_END()
1081 };
1082
1083 if (argc == 2 && !strcmp(argv[1], "-h"))
1084 usage_with_options(update_index_usage, options);
1085
1086 git_config(git_default_config, NULL);
1087
1088 prepare_repo_settings(r);
1089 the_repository->settings.command_requires_full_index = 0;
1090
1091 /* we will diagnose later if it turns out that we need to update it */
1092 newfd = hold_locked_index(&lock_file, 0);
1093 if (newfd < 0)
1094 lock_error = errno;
1095
1096 entries = read_cache();
1097 if (entries < 0)
1098 die("cache corrupted");
1099
1100 the_index.updated_skipworktree = 1;
1101
1102 /*
1103 * Custom copy of parse_options() because we want to handle
1104 * filename arguments as they come.
1105 */
1106 parse_options_start(&ctx, argc, argv, prefix,
1107 options, PARSE_OPT_STOP_AT_NON_OPTION);
1108 while (ctx.argc) {
1109 if (parseopt_state != PARSE_OPT_DONE)
1110 parseopt_state = parse_options_step(&ctx, options,
1111 update_index_usage);
1112 if (!ctx.argc)
1113 break;
1114 switch (parseopt_state) {
1115 case PARSE_OPT_HELP:
1116 case PARSE_OPT_ERROR:
1117 exit(129);
1118 case PARSE_OPT_COMPLETE:
1119 exit(0);
1120 case PARSE_OPT_NON_OPTION:
1121 case PARSE_OPT_DONE:
1122 {
1123 const char *path = ctx.argv[0];
1124 char *p;
1125
1126 setup_work_tree();
1127 p = prefix_path(prefix, prefix_length, path);
1128 update_one(p);
1129 if (set_executable_bit)
1130 chmod_path(set_executable_bit, p);
1131 free(p);
1132 ctx.argc--;
1133 ctx.argv++;
1134 break;
1135 }
1136 case PARSE_OPT_UNKNOWN:
1137 if (ctx.argv[0][1] == '-')
1138 error("unknown option '%s'", ctx.argv[0] + 2);
1139 else
1140 error("unknown switch '%c'", *ctx.opt);
1141 usage_with_options(update_index_usage, options);
1142 }
1143 }
1144 argc = parse_options_end(&ctx);
1145
1146 getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
1147 if (preferred_index_format) {
1148 if (preferred_index_format < INDEX_FORMAT_LB ||
1149 INDEX_FORMAT_UB < preferred_index_format)
1150 die("index-version %d not in range: %d..%d",
1151 preferred_index_format,
1152 INDEX_FORMAT_LB, INDEX_FORMAT_UB);
1153
1154 if (the_index.version != preferred_index_format)
1155 active_cache_changed |= SOMETHING_CHANGED;
1156 the_index.version = preferred_index_format;
1157 }
1158
1159 if (read_from_stdin) {
1160 struct strbuf buf = STRBUF_INIT;
1161 struct strbuf unquoted = STRBUF_INIT;
1162
1163 setup_work_tree();
1164 while (getline_fn(&buf, stdin) != EOF) {
1165 char *p;
1166 if (!nul_term_line && buf.buf[0] == '"') {
1167 strbuf_reset(&unquoted);
1168 if (unquote_c_style(&unquoted, buf.buf, NULL))
1169 die("line is badly quoted");
1170 strbuf_swap(&buf, &unquoted);
1171 }
1172 p = prefix_path(prefix, prefix_length, buf.buf);
1173 update_one(p);
1174 if (set_executable_bit)
1175 chmod_path(set_executable_bit, p);
1176 free(p);
1177 }
1178 strbuf_release(&unquoted);
1179 strbuf_release(&buf);
1180 }
1181
1182 if (split_index > 0) {
1183 if (git_config_get_split_index() == 0)
1184 warning(_("core.splitIndex is set to false; "
1185 "remove or change it, if you really want to "
1186 "enable split index"));
1187 if (the_index.split_index)
1188 the_index.cache_changed |= SPLIT_INDEX_ORDERED;
1189 else
1190 add_split_index(&the_index);
1191 } else if (!split_index) {
1192 if (git_config_get_split_index() == 1)
1193 warning(_("core.splitIndex is set to true; "
1194 "remove or change it, if you really want to "
1195 "disable split index"));
1196 remove_split_index(&the_index);
1197 }
1198
1199 prepare_repo_settings(r);
1200 switch (untracked_cache) {
1201 case UC_UNSPECIFIED:
1202 break;
1203 case UC_DISABLE:
1204 if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)
1205 warning(_("core.untrackedCache is set to true; "
1206 "remove or change it, if you really want to "
1207 "disable the untracked cache"));
1208 remove_untracked_cache(&the_index);
1209 report(_("Untracked cache disabled"));
1210 break;
1211 case UC_TEST:
1212 setup_work_tree();
1213 return !test_if_untracked_cache_is_supported();
1214 case UC_ENABLE:
1215 case UC_FORCE:
1216 if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE)
1217 warning(_("core.untrackedCache is set to false; "
1218 "remove or change it, if you really want to "
1219 "enable the untracked cache"));
1220 add_untracked_cache(&the_index);
1221 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1222 break;
1223 default:
1224 BUG("bad untracked_cache value: %d", untracked_cache);
1225 }
1226
1227 if (fsmonitor > 0) {
1228 if (git_config_get_fsmonitor() == 0)
1229 warning(_("core.fsmonitor is unset; "
1230 "set it if you really want to "
1231 "enable fsmonitor"));
1232 add_fsmonitor(&the_index);
1233 report(_("fsmonitor enabled"));
1234 } else if (!fsmonitor) {
1235 if (git_config_get_fsmonitor() == 1)
1236 warning(_("core.fsmonitor is set; "
1237 "remove it if you really want to "
1238 "disable fsmonitor"));
1239 remove_fsmonitor(&the_index);
1240 report(_("fsmonitor disabled"));
1241 }
1242
1243 if (active_cache_changed || force_write) {
1244 if (newfd < 0) {
1245 if (refresh_args.flags & REFRESH_QUIET)
1246 exit(128);
1247 unable_to_lock_die(get_index_file(), lock_error);
1248 }
1249 if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
1250 die("Unable to write new index file");
1251 }
1252
1253 rollback_lock_file(&lock_file);
1254
1255 return has_errors ? 1 : 0;
1256 }