builtin/show: do not prune by pathspec
[git/mjg.git] / builtin / update-index.c
blob45b4a8b5556e08688c615577f4931a173eb7435d
1 /*
2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
5 */
6 #define USE_THE_REPOSITORY_VARIABLE
7 #include "builtin.h"
8 #include "bulk-checkin.h"
9 #include "config.h"
10 #include "environment.h"
11 #include "gettext.h"
12 #include "hash.h"
13 #include "hex.h"
14 #include "lockfile.h"
15 #include "quote.h"
16 #include "cache-tree.h"
17 #include "tree-walk.h"
18 #include "object-file.h"
19 #include "refs.h"
20 #include "resolve-undo.h"
21 #include "parse-options.h"
22 #include "pathspec.h"
23 #include "dir.h"
24 #include "read-cache.h"
25 #include "setup.h"
26 #include "sparse-index.h"
27 #include "split-index.h"
28 #include "symlinks.h"
29 #include "fsmonitor.h"
30 #include "write-or-die.h"
33 * Default to not allowing changes to the list of files. The
34 * tool doesn't actually care, but this makes it harder to add
35 * files to the revision control by mistake by doing something
36 * like "git update-index *" and suddenly having all the object
37 * files be revision controlled.
39 static int allow_add;
40 static int allow_remove;
41 static int allow_replace;
42 static int info_only;
43 static int force_remove;
44 static int verbose;
45 static int mark_valid_only;
46 static int mark_skip_worktree_only;
47 static int mark_fsmonitor_only;
48 static int ignore_skip_worktree_entries;
49 #define MARK_FLAG 1
50 #define UNMARK_FLAG 2
51 static struct strbuf mtime_dir = STRBUF_INIT;
53 /* Untracked cache mode */
54 enum uc_mode {
55 UC_UNSPECIFIED = -1,
56 UC_DISABLE = 0,
57 UC_ENABLE,
58 UC_TEST,
59 UC_FORCE
62 __attribute__((format (printf, 1, 2)))
63 static void report(const char *fmt, ...)
65 va_list vp;
67 if (!verbose)
68 return;
71 * It is possible, though unlikely, that a caller could use the verbose
72 * output to synchronize with addition of objects to the object
73 * database. The current implementation of ODB transactions leaves
74 * objects invisible while a transaction is active, so flush the
75 * transaction here before reporting a change made by update-index.
77 flush_odb_transaction();
78 va_start(vp, fmt);
79 vprintf(fmt, vp);
80 putchar('\n');
81 va_end(vp);
84 static void remove_test_directory(void)
86 if (mtime_dir.len)
87 remove_dir_recursively(&mtime_dir, 0);
90 static const char *get_mtime_path(const char *path)
92 static struct strbuf sb = STRBUF_INIT;
93 strbuf_reset(&sb);
94 strbuf_addf(&sb, "%s/%s", mtime_dir.buf, path);
95 return sb.buf;
98 static void xmkdir(const char *path)
100 path = get_mtime_path(path);
101 if (mkdir(path, 0700))
102 die_errno(_("failed to create directory %s"), path);
105 static int xstat_mtime_dir(struct stat *st)
107 if (stat(mtime_dir.buf, st))
108 die_errno(_("failed to stat %s"), mtime_dir.buf);
109 return 0;
112 static int create_file(const char *path)
114 int fd;
115 path = get_mtime_path(path);
116 fd = xopen(path, O_CREAT | O_RDWR, 0644);
117 return fd;
120 static void xunlink(const char *path)
122 path = get_mtime_path(path);
123 if (unlink(path))
124 die_errno(_("failed to delete file %s"), path);
127 static void xrmdir(const char *path)
129 path = get_mtime_path(path);
130 if (rmdir(path))
131 die_errno(_("failed to delete directory %s"), path);
134 static void avoid_racy(void)
137 * not use if we could usleep(10) if USE_NSEC is defined. The
138 * field nsec could be there, but the OS could choose to
139 * ignore it?
141 sleep(1);
144 static int test_if_untracked_cache_is_supported(void)
146 struct stat st;
147 struct stat_data base;
148 int fd, ret = 0;
149 char *cwd;
151 strbuf_addstr(&mtime_dir, "mtime-test-XXXXXX");
152 if (!mkdtemp(mtime_dir.buf))
153 die_errno("Could not make temporary directory");
155 cwd = xgetcwd();
156 fprintf(stderr, _("Testing mtime in '%s' "), cwd);
157 free(cwd);
159 atexit(remove_test_directory);
160 xstat_mtime_dir(&st);
161 fill_stat_data(&base, &st);
162 fputc('.', stderr);
164 avoid_racy();
165 fd = create_file("newfile");
166 xstat_mtime_dir(&st);
167 if (!match_stat_data(&base, &st)) {
168 close(fd);
169 fputc('\n', stderr);
170 fprintf_ln(stderr,_("directory stat info does not "
171 "change after adding a new file"));
172 goto done;
174 fill_stat_data(&base, &st);
175 fputc('.', stderr);
177 avoid_racy();
178 xmkdir("new-dir");
179 xstat_mtime_dir(&st);
180 if (!match_stat_data(&base, &st)) {
181 close(fd);
182 fputc('\n', stderr);
183 fprintf_ln(stderr, _("directory stat info does not change "
184 "after adding a new directory"));
185 goto done;
187 fill_stat_data(&base, &st);
188 fputc('.', stderr);
190 avoid_racy();
191 write_or_die(fd, "data", 4);
192 close(fd);
193 xstat_mtime_dir(&st);
194 if (match_stat_data(&base, &st)) {
195 fputc('\n', stderr);
196 fprintf_ln(stderr, _("directory stat info changes "
197 "after updating a file"));
198 goto done;
200 fputc('.', stderr);
202 avoid_racy();
203 close(create_file("new-dir/new"));
204 xstat_mtime_dir(&st);
205 if (match_stat_data(&base, &st)) {
206 fputc('\n', stderr);
207 fprintf_ln(stderr, _("directory stat info changes after "
208 "adding a file inside subdirectory"));
209 goto done;
211 fputc('.', stderr);
213 avoid_racy();
214 xunlink("newfile");
215 xstat_mtime_dir(&st);
216 if (!match_stat_data(&base, &st)) {
217 fputc('\n', stderr);
218 fprintf_ln(stderr, _("directory stat info does not "
219 "change after deleting a file"));
220 goto done;
222 fill_stat_data(&base, &st);
223 fputc('.', stderr);
225 avoid_racy();
226 xunlink("new-dir/new");
227 xrmdir("new-dir");
228 xstat_mtime_dir(&st);
229 if (!match_stat_data(&base, &st)) {
230 fputc('\n', stderr);
231 fprintf_ln(stderr, _("directory stat info does not "
232 "change after deleting a directory"));
233 goto done;
236 if (rmdir(mtime_dir.buf))
237 die_errno(_("failed to delete directory %s"), mtime_dir.buf);
238 fprintf_ln(stderr, _(" OK"));
239 ret = 1;
241 done:
242 strbuf_release(&mtime_dir);
243 return ret;
246 static int mark_ce_flags(const char *path, int flag, int mark)
248 int namelen = strlen(path);
249 int pos = index_name_pos(the_repository->index, path, namelen);
250 if (0 <= pos) {
251 mark_fsmonitor_invalid(the_repository->index, the_repository->index->cache[pos]);
252 if (mark)
253 the_repository->index->cache[pos]->ce_flags |= flag;
254 else
255 the_repository->index->cache[pos]->ce_flags &= ~flag;
256 the_repository->index->cache[pos]->ce_flags |= CE_UPDATE_IN_BASE;
257 cache_tree_invalidate_path(the_repository->index, path);
258 the_repository->index->cache_changed |= CE_ENTRY_CHANGED;
259 return 0;
261 return -1;
264 static int remove_one_path(const char *path)
266 if (!allow_remove)
267 return error("%s: does not exist and --remove not passed", path);
268 if (remove_file_from_index(the_repository->index, path))
269 return error("%s: cannot remove from the index", path);
270 return 0;
274 * Handle a path that couldn't be lstat'ed. It's either:
275 * - missing file (ENOENT or ENOTDIR). That's ok if we're
276 * supposed to be removing it and the removal actually
277 * succeeds.
278 * - permission error. That's never ok.
280 static int process_lstat_error(const char *path, int err)
282 if (is_missing_file_error(err))
283 return remove_one_path(path);
284 return error("lstat(\"%s\"): %s", path, strerror(err));
287 static int add_one_path(const struct cache_entry *old, const char *path, int len, struct stat *st)
289 int option;
290 struct cache_entry *ce;
292 /* Was the old index entry already up-to-date? */
293 if (old && !ce_stage(old) && !ie_match_stat(the_repository->index, old, st, 0))
294 return 0;
296 ce = make_empty_cache_entry(the_repository->index, len);
297 memcpy(ce->name, path, len);
298 ce->ce_flags = create_ce_flags(0);
299 ce->ce_namelen = len;
300 fill_stat_cache_info(the_repository->index, ce, st);
301 ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
303 if (index_path(the_repository->index, &ce->oid, path, st,
304 info_only ? 0 : HASH_WRITE_OBJECT)) {
305 discard_cache_entry(ce);
306 return -1;
308 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
309 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
310 if (add_index_entry(the_repository->index, ce, option)) {
311 discard_cache_entry(ce);
312 return error("%s: cannot add to the index - missing --add option?", path);
314 return 0;
318 * Handle a path that was a directory. Four cases:
320 * - it's already a gitlink in the index, and we keep it that
321 * way, and update it if we can (if we cannot find the HEAD,
322 * we're going to keep it unchanged in the index!)
324 * - it's a *file* in the index, in which case it should be
325 * removed as a file if removal is allowed, since it doesn't
326 * exist as such any more. If removal isn't allowed, it's
327 * an error.
329 * (NOTE! This is old and arguably fairly strange behaviour.
330 * We might want to make this an error unconditionally, and
331 * use "--force-remove" if you actually want to force removal).
333 * - it used to exist as a subdirectory (ie multiple files with
334 * this particular prefix) in the index, in which case it's wrong
335 * to try to update it as a directory.
337 * - it doesn't exist at all in the index, but it is a valid
338 * git directory, and it should be *added* as a gitlink.
340 static int process_directory(const char *path, int len, struct stat *st)
342 struct object_id oid;
343 int pos = index_name_pos(the_repository->index, path, len);
345 /* Exact match: file or existing gitlink */
346 if (pos >= 0) {
347 const struct cache_entry *ce = the_repository->index->cache[pos];
348 if (S_ISGITLINK(ce->ce_mode)) {
350 /* Do nothing to the index if there is no HEAD! */
351 if (repo_resolve_gitlink_ref(the_repository, path,
352 "HEAD", &oid) < 0)
353 return 0;
355 return add_one_path(ce, path, len, st);
357 /* Should this be an unconditional error? */
358 return remove_one_path(path);
361 /* Inexact match: is there perhaps a subdirectory match? */
362 pos = -pos-1;
363 while (pos < the_repository->index->cache_nr) {
364 const struct cache_entry *ce = the_repository->index->cache[pos++];
366 if (strncmp(ce->name, path, len))
367 break;
368 if (ce->name[len] > '/')
369 break;
370 if (ce->name[len] < '/')
371 continue;
373 /* Subdirectory match - error out */
374 return error("%s: is a directory - add individual files instead", path);
377 /* No match - should we add it as a gitlink? */
378 if (!repo_resolve_gitlink_ref(the_repository, path, "HEAD", &oid))
379 return add_one_path(NULL, path, len, st);
381 /* Error out. */
382 return error("%s: is a directory - add files inside instead", path);
385 static int process_path(const char *path, struct stat *st, int stat_errno)
387 int pos, len;
388 const struct cache_entry *ce;
390 len = strlen(path);
391 if (has_symlink_leading_path(path, len))
392 return error("'%s' is beyond a symbolic link", path);
394 pos = index_name_pos(the_repository->index, path, len);
395 ce = pos < 0 ? NULL : the_repository->index->cache[pos];
396 if (ce && ce_skip_worktree(ce)) {
398 * working directory version is assumed "good"
399 * so updating it does not make sense.
400 * On the other hand, removing it from index should work
402 if (!ignore_skip_worktree_entries && allow_remove &&
403 remove_file_from_index(the_repository->index, path))
404 return error("%s: cannot remove from the index", path);
405 return 0;
409 * First things first: get the stat information, to decide
410 * what to do about the pathname!
412 if (stat_errno)
413 return process_lstat_error(path, stat_errno);
415 if (S_ISDIR(st->st_mode))
416 return process_directory(path, len, st);
418 return add_one_path(ce, path, len, st);
421 static int add_cacheinfo(unsigned int mode, const struct object_id *oid,
422 const char *path, int stage)
424 int len, option;
425 struct cache_entry *ce;
427 if (!verify_path(path, mode))
428 return error("Invalid path '%s'", path);
430 len = strlen(path);
431 ce = make_empty_cache_entry(the_repository->index, len);
433 oidcpy(&ce->oid, oid);
434 memcpy(ce->name, path, len);
435 ce->ce_flags = create_ce_flags(stage);
436 ce->ce_namelen = len;
437 ce->ce_mode = create_ce_mode(mode);
438 if (assume_unchanged)
439 ce->ce_flags |= CE_VALID;
440 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
441 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
442 if (add_index_entry(the_repository->index, ce, option))
443 return error("%s: cannot add to the index - missing --add option?",
444 path);
445 report("add '%s'", path);
446 return 0;
449 static void chmod_path(char flip, const char *path)
451 int pos;
452 struct cache_entry *ce;
454 pos = index_name_pos(the_repository->index, path, strlen(path));
455 if (pos < 0)
456 goto fail;
457 ce = the_repository->index->cache[pos];
458 if (chmod_index_entry(the_repository->index, ce, flip) < 0)
459 goto fail;
461 report("chmod %cx '%s'", flip, path);
462 return;
463 fail:
464 die("git update-index: cannot chmod %cx '%s'", flip, path);
467 static void update_one(const char *path)
469 int stat_errno = 0;
470 struct stat st;
472 if (mark_valid_only || mark_skip_worktree_only || force_remove ||
473 mark_fsmonitor_only)
474 st.st_mode = 0;
475 else if (lstat(path, &st) < 0) {
476 st.st_mode = 0;
477 stat_errno = errno;
478 } /* else stat is valid */
480 if (!verify_path(path, st.st_mode)) {
481 fprintf(stderr, "Ignoring path %s\n", path);
482 return;
484 if (mark_valid_only) {
485 if (mark_ce_flags(path, CE_VALID, mark_valid_only == MARK_FLAG))
486 die("Unable to mark file %s", path);
487 return;
489 if (mark_skip_worktree_only) {
490 if (mark_ce_flags(path, CE_SKIP_WORKTREE, mark_skip_worktree_only == MARK_FLAG))
491 die("Unable to mark file %s", path);
492 return;
494 if (mark_fsmonitor_only) {
495 if (mark_ce_flags(path, CE_FSMONITOR_VALID, mark_fsmonitor_only == MARK_FLAG))
496 die("Unable to mark file %s", path);
497 return;
500 if (force_remove) {
501 if (remove_file_from_index(the_repository->index, path))
502 die("git update-index: unable to remove %s", path);
503 report("remove '%s'", path);
504 return;
506 if (process_path(path, &st, stat_errno))
507 die("Unable to process path %s", path);
508 report("add '%s'", path);
511 static void read_index_info(int nul_term_line)
513 const int hexsz = the_hash_algo->hexsz;
514 struct strbuf buf = STRBUF_INIT;
515 struct strbuf uq = STRBUF_INIT;
516 strbuf_getline_fn getline_fn;
518 getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
519 while (getline_fn(&buf, stdin) != EOF) {
520 char *ptr, *tab;
521 char *path_name;
522 struct object_id oid;
523 unsigned int mode;
524 unsigned long ul;
525 int stage;
527 /* This reads lines formatted in one of three formats:
529 * (1) mode SP sha1 TAB path
530 * The first format is what "git apply --index-info"
531 * reports, and used to reconstruct a partial tree
532 * that is used for phony merge base tree when falling
533 * back on 3-way merge.
535 * (2) mode SP type SP sha1 TAB path
536 * The second format is to stuff "git ls-tree" output
537 * into the index file.
539 * (3) mode SP sha1 SP stage TAB path
540 * This format is to put higher order stages into the
541 * index file and matches "git ls-files --stage" output.
543 errno = 0;
544 ul = strtoul(buf.buf, &ptr, 8);
545 if (ptr == buf.buf || *ptr != ' '
546 || errno || (unsigned int) ul != ul)
547 goto bad_line;
548 mode = ul;
550 tab = strchr(ptr, '\t');
551 if (!tab || tab - ptr < hexsz + 1)
552 goto bad_line;
554 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
555 stage = tab[-1] - '0';
556 ptr = tab + 1; /* point at the head of path */
557 tab = tab - 2; /* point at tail of sha1 */
559 else {
560 stage = 0;
561 ptr = tab + 1; /* point at the head of path */
564 if (get_oid_hex(tab - hexsz, &oid) ||
565 tab[-(hexsz + 1)] != ' ')
566 goto bad_line;
568 path_name = ptr;
569 if (!nul_term_line && path_name[0] == '"') {
570 strbuf_reset(&uq);
571 if (unquote_c_style(&uq, path_name, NULL)) {
572 die("git update-index: bad quoting of path name");
574 path_name = uq.buf;
577 if (!verify_path(path_name, mode)) {
578 fprintf(stderr, "Ignoring path %s\n", path_name);
579 continue;
582 if (!mode) {
583 /* mode == 0 means there is no such path -- remove */
584 if (remove_file_from_index(the_repository->index, path_name))
585 die("git update-index: unable to remove %s",
586 ptr);
588 else {
589 /* mode ' ' sha1 '\t' name
590 * ptr[-1] points at tab,
591 * ptr[-41] is at the beginning of sha1
593 ptr[-(hexsz + 2)] = ptr[-1] = 0;
594 if (add_cacheinfo(mode, &oid, path_name, stage))
595 die("git update-index: unable to update %s",
596 path_name);
598 continue;
600 bad_line:
601 die("malformed index info %s", buf.buf);
603 strbuf_release(&buf);
604 strbuf_release(&uq);
607 static const char * const update_index_usage[] = {
608 N_("git update-index [<options>] [--] [<file>...]"),
609 NULL
612 static struct cache_entry *read_one_ent(const char *which,
613 struct object_id *ent, const char *path,
614 int namelen, int stage)
616 unsigned short mode;
617 struct object_id oid;
618 struct cache_entry *ce;
620 if (get_tree_entry(the_repository, ent, path, &oid, &mode)) {
621 if (which)
622 error("%s: not in %s branch.", path, which);
623 return NULL;
625 if (!the_repository->index->sparse_index && mode == S_IFDIR) {
626 if (which)
627 error("%s: not a blob in %s branch.", path, which);
628 return NULL;
630 ce = make_empty_cache_entry(the_repository->index, namelen);
632 oidcpy(&ce->oid, &oid);
633 memcpy(ce->name, path, namelen);
634 ce->ce_flags = create_ce_flags(stage);
635 ce->ce_namelen = namelen;
636 ce->ce_mode = create_ce_mode(mode);
637 return ce;
640 static int unresolve_one(const char *path)
642 struct string_list_item *item;
643 int res = 0;
645 if (!the_repository->index->resolve_undo)
646 return res;
647 item = string_list_lookup(the_repository->index->resolve_undo, path);
648 if (!item)
649 return res; /* no resolve-undo record for the path */
650 res = unmerge_index_entry(the_repository->index, path, item->util, 0);
651 FREE_AND_NULL(item->util);
652 return res;
655 static int do_unresolve(int ac, const char **av,
656 const char *prefix, int prefix_length)
658 int i;
659 int err = 0;
661 for (i = 1; i < ac; i++) {
662 const char *arg = av[i];
663 char *p = prefix_path(prefix, prefix_length, arg);
664 err |= unresolve_one(p);
665 free(p);
667 return err;
670 static int do_reupdate(const char **paths,
671 const char *prefix)
673 /* Read HEAD and run update-index on paths that are
674 * merged and already different between index and HEAD.
676 int pos;
677 int has_head = 1;
678 struct pathspec pathspec;
679 struct object_id head_oid;
681 parse_pathspec(&pathspec, 0,
682 PATHSPEC_PREFER_CWD,
683 prefix, paths);
685 if (refs_read_ref(get_main_ref_store(the_repository), "HEAD", &head_oid))
686 /* If there is no HEAD, that means it is an initial
687 * commit. Update everything in the index.
689 has_head = 0;
690 redo:
691 for (pos = 0; pos < the_repository->index->cache_nr; pos++) {
692 const struct cache_entry *ce = the_repository->index->cache[pos];
693 struct cache_entry *old = NULL;
694 int save_nr;
695 char *path;
697 if (ce_stage(ce) || !ce_path_match(the_repository->index, ce, &pathspec, NULL))
698 continue;
699 if (has_head)
700 old = read_one_ent(NULL, &head_oid,
701 ce->name, ce_namelen(ce), 0);
702 if (old && ce->ce_mode == old->ce_mode &&
703 oideq(&ce->oid, &old->oid)) {
704 discard_cache_entry(old);
705 continue; /* unchanged */
708 /* At this point, we know the contents of the sparse directory are
709 * modified with respect to HEAD, so we expand the index and restart
710 * to process each path individually
712 if (S_ISSPARSEDIR(ce->ce_mode)) {
713 ensure_full_index(the_repository->index);
714 goto redo;
717 /* Be careful. The working tree may not have the
718 * path anymore, in which case, under 'allow_remove',
719 * or worse yet 'allow_replace', active_nr may decrease.
721 save_nr = the_repository->index->cache_nr;
722 path = xstrdup(ce->name);
723 update_one(path);
724 free(path);
725 discard_cache_entry(old);
726 if (save_nr != the_repository->index->cache_nr)
727 goto redo;
729 clear_pathspec(&pathspec);
730 return 0;
733 struct refresh_params {
734 unsigned int flags;
735 int *has_errors;
738 static int refresh(struct refresh_params *o, unsigned int flag)
740 setup_work_tree();
741 repo_read_index(the_repository);
742 *o->has_errors |= refresh_index(the_repository->index, o->flags | flag, NULL,
743 NULL, NULL);
744 if (has_racy_timestamp(the_repository->index)) {
746 * Even if nothing else has changed, updating the file
747 * increases the chance that racy timestamps become
748 * non-racy, helping future run-time performance.
749 * We do that even in case of "errors" returned by
750 * refresh_index() as these are no actual errors.
751 * cmd_status() does the same.
753 the_repository->index->cache_changed |= SOMETHING_CHANGED;
755 return 0;
758 static int refresh_callback(const struct option *opt,
759 const char *arg, int unset)
761 BUG_ON_OPT_NEG(unset);
762 BUG_ON_OPT_ARG(arg);
763 return refresh(opt->value, 0);
766 static int really_refresh_callback(const struct option *opt,
767 const char *arg, int unset)
769 BUG_ON_OPT_NEG(unset);
770 BUG_ON_OPT_ARG(arg);
771 return refresh(opt->value, REFRESH_REALLY);
774 static int chmod_callback(const struct option *opt,
775 const char *arg, int unset)
777 char *flip = opt->value;
778 BUG_ON_OPT_NEG(unset);
779 if ((arg[0] != '-' && arg[0] != '+') || arg[1] != 'x' || arg[2])
780 return error("option 'chmod' expects \"+x\" or \"-x\"");
781 *flip = arg[0];
782 return 0;
785 static int resolve_undo_clear_callback(const struct option *opt UNUSED,
786 const char *arg, int unset)
788 BUG_ON_OPT_NEG(unset);
789 BUG_ON_OPT_ARG(arg);
790 resolve_undo_clear_index(the_repository->index);
791 return 0;
794 static int parse_new_style_cacheinfo(const char *arg,
795 unsigned int *mode,
796 struct object_id *oid,
797 const char **path)
799 unsigned long ul;
800 char *endp;
801 const char *p;
803 if (!arg)
804 return -1;
806 errno = 0;
807 ul = strtoul(arg, &endp, 8);
808 if (errno || endp == arg || *endp != ',' || (unsigned int) ul != ul)
809 return -1; /* not a new-style cacheinfo */
810 *mode = ul;
811 endp++;
812 if (parse_oid_hex(endp, oid, &p) || *p != ',')
813 return -1;
814 *path = p + 1;
815 return 0;
818 static enum parse_opt_result cacheinfo_callback(
819 struct parse_opt_ctx_t *ctx, const struct option *opt UNUSED,
820 const char *arg, int unset)
822 struct object_id oid;
823 unsigned int mode;
824 const char *path;
826 BUG_ON_OPT_NEG(unset);
827 BUG_ON_OPT_ARG(arg);
829 if (!parse_new_style_cacheinfo(ctx->argv[1], &mode, &oid, &path)) {
830 if (add_cacheinfo(mode, &oid, path, 0))
831 die("git update-index: --cacheinfo cannot add %s", path);
832 ctx->argv++;
833 ctx->argc--;
834 return 0;
836 if (ctx->argc <= 3)
837 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
838 if (strtoul_ui(*++ctx->argv, 8, &mode) ||
839 get_oid_hex(*++ctx->argv, &oid) ||
840 add_cacheinfo(mode, &oid, *++ctx->argv, 0))
841 die("git update-index: --cacheinfo cannot add %s", *ctx->argv);
842 ctx->argc -= 3;
843 return 0;
846 static enum parse_opt_result stdin_cacheinfo_callback(
847 struct parse_opt_ctx_t *ctx, const struct option *opt,
848 const char *arg, int unset)
850 int *nul_term_line = opt->value;
852 BUG_ON_OPT_NEG(unset);
853 BUG_ON_OPT_ARG(arg);
855 if (ctx->argc != 1)
856 return error("option '%s' must be the last argument", opt->long_name);
857 allow_add = allow_replace = allow_remove = 1;
858 read_index_info(*nul_term_line);
859 return 0;
862 static enum parse_opt_result stdin_callback(
863 struct parse_opt_ctx_t *ctx, const struct option *opt,
864 const char *arg, int unset)
866 int *read_from_stdin = opt->value;
868 BUG_ON_OPT_NEG(unset);
869 BUG_ON_OPT_ARG(arg);
871 if (ctx->argc != 1)
872 return error("option '%s' must be the last argument", opt->long_name);
873 *read_from_stdin = 1;
874 return 0;
877 static enum parse_opt_result unresolve_callback(
878 struct parse_opt_ctx_t *ctx, const struct option *opt,
879 const char *arg, int unset)
881 int *has_errors = opt->value;
882 const char *prefix = startup_info->prefix;
884 BUG_ON_OPT_NEG(unset);
885 BUG_ON_OPT_ARG(arg);
887 /* consume remaining arguments. */
888 *has_errors = do_unresolve(ctx->argc, ctx->argv,
889 prefix, prefix ? strlen(prefix) : 0);
890 if (*has_errors)
891 the_repository->index->cache_changed = 0;
893 ctx->argv += ctx->argc - 1;
894 ctx->argc = 1;
895 return 0;
898 static enum parse_opt_result reupdate_callback(
899 struct parse_opt_ctx_t *ctx, const struct option *opt,
900 const char *arg, int unset)
902 int *has_errors = opt->value;
903 const char *prefix = startup_info->prefix;
905 BUG_ON_OPT_NEG(unset);
906 BUG_ON_OPT_ARG(arg);
908 /* consume remaining arguments. */
909 setup_work_tree();
910 *has_errors = do_reupdate(ctx->argv + 1, prefix);
911 if (*has_errors)
912 the_repository->index->cache_changed = 0;
914 ctx->argv += ctx->argc - 1;
915 ctx->argc = 1;
916 return 0;
919 int cmd_update_index(int argc,
920 const char **argv,
921 const char *prefix,
922 struct repository *repo UNUSED)
924 int newfd, entries, has_errors = 0, nul_term_line = 0;
925 enum uc_mode untracked_cache = UC_UNSPECIFIED;
926 int read_from_stdin = 0;
927 int prefix_length = prefix ? strlen(prefix) : 0;
928 int preferred_index_format = 0;
929 char set_executable_bit = 0;
930 struct refresh_params refresh_args = {0, &has_errors};
931 int lock_error = 0;
932 int split_index = -1;
933 int force_write = 0;
934 int fsmonitor = -1;
935 struct lock_file lock_file = LOCK_INIT;
936 struct parse_opt_ctx_t ctx;
937 strbuf_getline_fn getline_fn;
938 int parseopt_state = PARSE_OPT_UNKNOWN;
939 struct repository *r = the_repository;
940 struct option options[] = {
941 OPT_BIT('q', NULL, &refresh_args.flags,
942 N_("continue refresh even when index needs update"),
943 REFRESH_QUIET),
944 OPT_BIT(0, "ignore-submodules", &refresh_args.flags,
945 N_("refresh: ignore submodules"),
946 REFRESH_IGNORE_SUBMODULES),
947 OPT_SET_INT(0, "add", &allow_add,
948 N_("do not ignore new files"), 1),
949 OPT_SET_INT(0, "replace", &allow_replace,
950 N_("let files replace directories and vice-versa"), 1),
951 OPT_SET_INT(0, "remove", &allow_remove,
952 N_("notice files missing from worktree"), 1),
953 OPT_BIT(0, "unmerged", &refresh_args.flags,
954 N_("refresh even if index contains unmerged entries"),
955 REFRESH_UNMERGED),
956 OPT_CALLBACK_F(0, "refresh", &refresh_args, NULL,
957 N_("refresh stat information"),
958 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
959 refresh_callback),
960 OPT_CALLBACK_F(0, "really-refresh", &refresh_args, NULL,
961 N_("like --refresh, but ignore assume-unchanged setting"),
962 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
963 really_refresh_callback),
964 {OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
965 N_("<mode>,<object>,<path>"),
966 N_("add the specified entry to the index"),
967 PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
968 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
969 NULL, 0,
970 cacheinfo_callback},
971 OPT_CALLBACK_F(0, "chmod", &set_executable_bit, "(+|-)x",
972 N_("override the executable bit of the listed files"),
973 PARSE_OPT_NONEG,
974 chmod_callback),
975 {OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
976 N_("mark files as \"not changing\""),
977 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
978 {OPTION_SET_INT, 0, "no-assume-unchanged", &mark_valid_only, NULL,
979 N_("clear assumed-unchanged bit"),
980 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
981 {OPTION_SET_INT, 0, "skip-worktree", &mark_skip_worktree_only, NULL,
982 N_("mark files as \"index-only\""),
983 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
984 {OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
985 N_("clear skip-worktree bit"),
986 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
987 OPT_BOOL(0, "ignore-skip-worktree-entries", &ignore_skip_worktree_entries,
988 N_("do not touch index-only entries")),
989 OPT_SET_INT(0, "info-only", &info_only,
990 N_("add to index only; do not add content to object database"), 1),
991 OPT_SET_INT(0, "force-remove", &force_remove,
992 N_("remove named paths even if present in worktree"), 1),
993 OPT_BOOL('z', NULL, &nul_term_line,
994 N_("with --stdin: input lines are terminated by null bytes")),
995 {OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
996 N_("read list of paths to be updated from standard input"),
997 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
998 NULL, 0, stdin_callback},
999 {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &nul_term_line, NULL,
1000 N_("add entries from standard input to the index"),
1001 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1002 NULL, 0, stdin_cacheinfo_callback},
1003 {OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
1004 N_("repopulate stages #2 and #3 for the listed paths"),
1005 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1006 NULL, 0, unresolve_callback},
1007 {OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
1008 N_("only update entries that differ from HEAD"),
1009 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1010 NULL, 0, reupdate_callback},
1011 OPT_BIT(0, "ignore-missing", &refresh_args.flags,
1012 N_("ignore files missing from worktree"),
1013 REFRESH_IGNORE_MISSING),
1014 OPT_SET_INT(0, "verbose", &verbose,
1015 N_("report actions to standard output"), 1),
1016 OPT_CALLBACK_F(0, "clear-resolve-undo", NULL, NULL,
1017 N_("(for porcelains) forget saved unresolved conflicts"),
1018 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1019 resolve_undo_clear_callback),
1020 OPT_INTEGER(0, "index-version", &preferred_index_format,
1021 N_("write index in this format")),
1022 OPT_SET_INT(0, "show-index-version", &preferred_index_format,
1023 N_("report on-disk index format version"), -1),
1024 OPT_BOOL(0, "split-index", &split_index,
1025 N_("enable or disable split index")),
1026 OPT_BOOL(0, "untracked-cache", &untracked_cache,
1027 N_("enable/disable untracked cache")),
1028 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache,
1029 N_("test if the filesystem supports untracked cache"), UC_TEST),
1030 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache,
1031 N_("enable untracked cache without testing the filesystem"), UC_FORCE),
1032 OPT_SET_INT(0, "force-write-index", &force_write,
1033 N_("write out the index even if is not flagged as changed"), 1),
1034 OPT_BOOL(0, "fsmonitor", &fsmonitor,
1035 N_("enable or disable file system monitor")),
1036 {OPTION_SET_INT, 0, "fsmonitor-valid", &mark_fsmonitor_only, NULL,
1037 N_("mark files as fsmonitor valid"),
1038 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
1039 {OPTION_SET_INT, 0, "no-fsmonitor-valid", &mark_fsmonitor_only, NULL,
1040 N_("clear fsmonitor valid bit"),
1041 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
1042 OPT_END()
1045 if (argc == 2 && !strcmp(argv[1], "-h"))
1046 usage_with_options(update_index_usage, options);
1048 git_config(git_default_config, NULL);
1050 prepare_repo_settings(r);
1051 the_repository->settings.command_requires_full_index = 0;
1053 /* we will diagnose later if it turns out that we need to update it */
1054 newfd = repo_hold_locked_index(the_repository, &lock_file, 0);
1055 if (newfd < 0)
1056 lock_error = errno;
1058 entries = repo_read_index(the_repository);
1059 if (entries < 0)
1060 die("cache corrupted");
1062 the_repository->index->updated_skipworktree = 1;
1065 * Custom copy of parse_options() because we want to handle
1066 * filename arguments as they come.
1068 parse_options_start(&ctx, argc, argv, prefix,
1069 options, PARSE_OPT_STOP_AT_NON_OPTION);
1072 * Allow the object layer to optimize adding multiple objects in
1073 * a batch.
1075 begin_odb_transaction();
1076 while (ctx.argc) {
1077 if (parseopt_state != PARSE_OPT_DONE)
1078 parseopt_state = parse_options_step(&ctx, options,
1079 update_index_usage);
1080 if (!ctx.argc)
1081 break;
1082 switch (parseopt_state) {
1083 case PARSE_OPT_HELP:
1084 case PARSE_OPT_ERROR:
1085 exit(129);
1086 case PARSE_OPT_COMPLETE:
1087 exit(0);
1088 case PARSE_OPT_NON_OPTION:
1089 case PARSE_OPT_DONE:
1091 const char *path = ctx.argv[0];
1092 char *p;
1094 setup_work_tree();
1095 p = prefix_path(prefix, prefix_length, path);
1096 update_one(p);
1097 if (set_executable_bit)
1098 chmod_path(set_executable_bit, p);
1099 free(p);
1100 ctx.argc--;
1101 ctx.argv++;
1102 break;
1104 case PARSE_OPT_UNKNOWN:
1105 if (ctx.argv[0][1] == '-')
1106 error("unknown option '%s'", ctx.argv[0] + 2);
1107 else
1108 error("unknown switch '%c'", *ctx.opt);
1109 usage_with_options(update_index_usage, options);
1112 argc = parse_options_end(&ctx);
1114 getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
1115 if (preferred_index_format) {
1116 if (preferred_index_format < 0) {
1117 printf(_("%d\n"), the_repository->index->version);
1118 } else if (preferred_index_format < INDEX_FORMAT_LB ||
1119 INDEX_FORMAT_UB < preferred_index_format) {
1120 die("index-version %d not in range: %d..%d",
1121 preferred_index_format,
1122 INDEX_FORMAT_LB, INDEX_FORMAT_UB);
1123 } else {
1124 if (the_repository->index->version != preferred_index_format)
1125 the_repository->index->cache_changed |= SOMETHING_CHANGED;
1126 report(_("index-version: was %d, set to %d"),
1127 the_repository->index->version, preferred_index_format);
1128 the_repository->index->version = preferred_index_format;
1132 if (read_from_stdin) {
1133 struct strbuf buf = STRBUF_INIT;
1134 struct strbuf unquoted = STRBUF_INIT;
1136 setup_work_tree();
1137 while (getline_fn(&buf, stdin) != EOF) {
1138 char *p;
1139 if (!nul_term_line && buf.buf[0] == '"') {
1140 strbuf_reset(&unquoted);
1141 if (unquote_c_style(&unquoted, buf.buf, NULL))
1142 die("line is badly quoted");
1143 strbuf_swap(&buf, &unquoted);
1145 p = prefix_path(prefix, prefix_length, buf.buf);
1146 update_one(p);
1147 if (set_executable_bit)
1148 chmod_path(set_executable_bit, p);
1149 free(p);
1151 strbuf_release(&unquoted);
1152 strbuf_release(&buf);
1156 * By now we have added all of the new objects
1158 end_odb_transaction();
1160 if (split_index > 0) {
1161 if (repo_config_get_split_index(the_repository) == 0)
1162 warning(_("core.splitIndex is set to false; "
1163 "remove or change it, if you really want to "
1164 "enable split index"));
1165 if (the_repository->index->split_index)
1166 the_repository->index->cache_changed |= SPLIT_INDEX_ORDERED;
1167 else
1168 add_split_index(the_repository->index);
1169 } else if (!split_index) {
1170 if (repo_config_get_split_index(the_repository) == 1)
1171 warning(_("core.splitIndex is set to true; "
1172 "remove or change it, if you really want to "
1173 "disable split index"));
1174 remove_split_index(the_repository->index);
1177 prepare_repo_settings(r);
1178 switch (untracked_cache) {
1179 case UC_UNSPECIFIED:
1180 break;
1181 case UC_DISABLE:
1182 if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)
1183 warning(_("core.untrackedCache is set to true; "
1184 "remove or change it, if you really want to "
1185 "disable the untracked cache"));
1186 remove_untracked_cache(the_repository->index);
1187 report(_("Untracked cache disabled"));
1188 break;
1189 case UC_TEST:
1190 setup_work_tree();
1191 return !test_if_untracked_cache_is_supported();
1192 case UC_ENABLE:
1193 case UC_FORCE:
1194 if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE)
1195 warning(_("core.untrackedCache is set to false; "
1196 "remove or change it, if you really want to "
1197 "enable the untracked cache"));
1198 add_untracked_cache(the_repository->index);
1199 report(_("Untracked cache enabled for '%s'"), repo_get_work_tree(the_repository));
1200 break;
1201 default:
1202 BUG("bad untracked_cache value: %d", untracked_cache);
1205 if (fsmonitor > 0) {
1206 enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
1207 enum fsmonitor_reason reason = fsm_settings__get_reason(r);
1210 * The user wants to turn on FSMonitor using the command
1211 * line argument. (We don't know (or care) whether that
1212 * is the IPC or HOOK version.)
1214 * Use one of the __get routines to force load the FSMonitor
1215 * config settings into the repo-settings. That will detect
1216 * whether the file system is compatible so that we can stop
1217 * here with a nice error message.
1219 if (reason > FSMONITOR_REASON_OK)
1220 die("%s",
1221 fsm_settings__get_incompatible_msg(r, reason));
1223 if (fsm_mode == FSMONITOR_MODE_DISABLED) {
1224 warning(_("core.fsmonitor is unset; "
1225 "set it if you really want to "
1226 "enable fsmonitor"));
1228 add_fsmonitor(the_repository->index);
1229 report(_("fsmonitor enabled"));
1230 } else if (!fsmonitor) {
1231 enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
1232 if (fsm_mode > FSMONITOR_MODE_DISABLED)
1233 warning(_("core.fsmonitor is set; "
1234 "remove it if you really want to "
1235 "disable fsmonitor"));
1236 remove_fsmonitor(the_repository->index);
1237 report(_("fsmonitor disabled"));
1240 if (the_repository->index->cache_changed || force_write) {
1241 if (newfd < 0) {
1242 if (refresh_args.flags & REFRESH_QUIET)
1243 exit(128);
1244 unable_to_lock_die(repo_get_index_file(the_repository), lock_error);
1246 if (write_locked_index(the_repository->index, &lock_file, COMMIT_LOCK))
1247 die("Unable to write new index file");
1250 rollback_lock_file(&lock_file);
1252 return has_errors ? 1 : 0;