2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
6 #define USE_THE_INDEX_COMPATIBILITY_MACROS
11 #include "cache-tree.h"
12 #include "tree-walk.h"
15 #include "resolve-undo.h"
16 #include "parse-options.h"
19 #include "split-index.h"
20 #include "fsmonitor.h"
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.
30 static int allow_remove
;
31 static int allow_replace
;
33 static int force_remove
;
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
;
41 static struct strbuf mtime_dir
= STRBUF_INIT
;
43 /* Untracked cache mode */
52 __attribute__((format (printf
, 1, 2)))
53 static void report(const char *fmt
, ...)
66 static void remove_test_directory(void)
69 remove_dir_recursively(&mtime_dir
, 0);
72 static const char *get_mtime_path(const char *path
)
74 static struct strbuf sb
= STRBUF_INIT
;
76 strbuf_addf(&sb
, "%s/%s", mtime_dir
.buf
, path
);
80 static void xmkdir(const char *path
)
82 path
= get_mtime_path(path
);
83 if (mkdir(path
, 0700))
84 die_errno(_("failed to create directory %s"), path
);
87 static int xstat_mtime_dir(struct stat
*st
)
89 if (stat(mtime_dir
.buf
, st
))
90 die_errno(_("failed to stat %s"), mtime_dir
.buf
);
94 static int create_file(const char *path
)
97 path
= get_mtime_path(path
);
98 fd
= xopen(path
, O_CREAT
| O_RDWR
, 0644);
102 static void xunlink(const char *path
)
104 path
= get_mtime_path(path
);
106 die_errno(_("failed to delete file %s"), path
);
109 static void xrmdir(const char *path
)
111 path
= get_mtime_path(path
);
113 die_errno(_("failed to delete directory %s"), path
);
116 static void avoid_racy(void)
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
126 static int test_if_untracked_cache_is_supported(void)
129 struct stat_data base
;
133 strbuf_addstr(&mtime_dir
, "mtime-test-XXXXXX");
134 if (!mkdtemp(mtime_dir
.buf
))
135 die_errno("Could not make temporary directory");
138 fprintf(stderr
, _("Testing mtime in '%s' "), cwd
);
141 atexit(remove_test_directory
);
142 xstat_mtime_dir(&st
);
143 fill_stat_data(&base
, &st
);
147 fd
= create_file("newfile");
148 xstat_mtime_dir(&st
);
149 if (!match_stat_data(&base
, &st
)) {
152 fprintf_ln(stderr
,_("directory stat info does not "
153 "change after adding a new file"));
156 fill_stat_data(&base
, &st
);
161 xstat_mtime_dir(&st
);
162 if (!match_stat_data(&base
, &st
)) {
165 fprintf_ln(stderr
, _("directory stat info does not change "
166 "after adding a new directory"));
169 fill_stat_data(&base
, &st
);
173 write_or_die(fd
, "data", 4);
175 xstat_mtime_dir(&st
);
176 if (match_stat_data(&base
, &st
)) {
178 fprintf_ln(stderr
, _("directory stat info changes "
179 "after updating a file"));
185 close(create_file("new-dir/new"));
186 xstat_mtime_dir(&st
);
187 if (match_stat_data(&base
, &st
)) {
189 fprintf_ln(stderr
, _("directory stat info changes after "
190 "adding a file inside subdirectory"));
197 xstat_mtime_dir(&st
);
198 if (!match_stat_data(&base
, &st
)) {
200 fprintf_ln(stderr
, _("directory stat info does not "
201 "change after deleting a file"));
204 fill_stat_data(&base
, &st
);
208 xunlink("new-dir/new");
210 xstat_mtime_dir(&st
);
211 if (!match_stat_data(&base
, &st
)) {
213 fprintf_ln(stderr
, _("directory stat info does not "
214 "change after deleting a directory"));
218 if (rmdir(mtime_dir
.buf
))
219 die_errno(_("failed to delete directory %s"), mtime_dir
.buf
);
220 fprintf_ln(stderr
, _(" OK"));
224 strbuf_release(&mtime_dir
);
228 static int mark_ce_flags(const char *path
, int flag
, int mark
)
230 int namelen
= strlen(path
);
231 int pos
= cache_name_pos(path
, namelen
);
233 mark_fsmonitor_invalid(&the_index
, active_cache
[pos
]);
235 active_cache
[pos
]->ce_flags
|= flag
;
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
;
246 static int remove_one_path(const char *path
)
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
);
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
260 * - permission error. That's never ok.
262 static int process_lstat_error(const char *path
, int err
)
264 if (is_missing_file_error(err
))
265 return remove_one_path(path
);
266 return error("lstat(\"%s\"): %s", path
, strerror(err
));
269 static int add_one_path(const struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
272 struct cache_entry
*ce
;
274 /* Was the old index entry already up-to-date? */
275 if (old
&& !ce_stage(old
) && !ce_match_stat(old
, st
, 0))
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
);
285 if (index_path(&the_index
, &ce
->oid
, path
, st
,
286 info_only
? 0 : HASH_WRITE_OBJECT
)) {
287 discard_cache_entry(ce
);
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
);
300 * Handle a path that was a directory. Four cases:
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!)
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
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).
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.
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.
322 static int process_directory(const char *path
, int len
, struct stat
*st
)
324 struct object_id oid
;
325 int pos
= cache_name_pos(path
, len
);
327 /* Exact match: file or existing gitlink */
329 const struct cache_entry
*ce
= active_cache
[pos
];
330 if (S_ISGITLINK(ce
->ce_mode
)) {
332 /* Do nothing to the index if there is no HEAD! */
333 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
336 return add_one_path(ce
, path
, len
, st
);
338 /* Should this be an unconditional error? */
339 return remove_one_path(path
);
342 /* Inexact match: is there perhaps a subdirectory match? */
344 while (pos
< active_nr
) {
345 const struct cache_entry
*ce
= active_cache
[pos
++];
347 if (strncmp(ce
->name
, path
, len
))
349 if (ce
->name
[len
] > '/')
351 if (ce
->name
[len
] < '/')
354 /* Subdirectory match - error out */
355 return error("%s: is a directory - add individual files instead", path
);
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
);
363 return error("%s: is a directory - add files inside instead", path
);
366 static int process_path(const char *path
, struct stat
*st
, int stat_errno
)
369 const struct cache_entry
*ce
;
372 if (has_symlink_leading_path(path
, len
))
373 return error("'%s' is beyond a symbolic link", path
);
375 pos
= cache_name_pos(path
, len
);
376 ce
= pos
< 0 ? NULL
: active_cache
[pos
];
377 if (ce
&& ce_skip_worktree(ce
)) {
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
383 if (!ignore_skip_worktree_entries
&& allow_remove
&&
384 remove_file_from_cache(path
))
385 return error("%s: cannot remove from the index", path
);
390 * First things first: get the stat information, to decide
391 * what to do about the pathname!
394 return process_lstat_error(path
, stat_errno
);
396 if (S_ISDIR(st
->st_mode
))
397 return process_directory(path
, len
, st
);
399 return add_one_path(ce
, path
, len
, st
);
402 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
403 const char *path
, int stage
)
406 struct cache_entry
*ce
;
408 if (!verify_path(path
, mode
))
409 return error("Invalid path '%s'", path
);
412 ce
= make_empty_cache_entry(&the_index
, len
);
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?",
426 report("add '%s'", path
);
430 static void chmod_path(char flip
, const char *path
)
433 struct cache_entry
*ce
;
435 pos
= cache_name_pos(path
, strlen(path
));
438 ce
= active_cache
[pos
];
439 if (chmod_cache_entry(ce
, flip
) < 0)
442 report("chmod %cx '%s'", flip
, path
);
445 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
448 static void update_one(const char *path
)
453 if (mark_valid_only
|| mark_skip_worktree_only
|| force_remove
||
456 else if (lstat(path
, &st
) < 0) {
459 } /* else stat is valid */
461 if (!verify_path(path
, st
.st_mode
)) {
462 fprintf(stderr
, "Ignoring path %s\n", path
);
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
);
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
);
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
);
482 if (remove_file_from_cache(path
))
483 die("git update-index: unable to remove %s", path
);
484 report("remove '%s'", path
);
487 if (process_path(path
, &st
, stat_errno
))
488 die("Unable to process path %s", path
);
489 report("add '%s'", path
);
492 static void read_index_info(int nul_term_line
)
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
;
499 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
500 while (getline_fn(&buf
, stdin
) != EOF
) {
503 struct object_id oid
;
508 /* This reads lines formatted in one of three formats:
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.
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.
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.
525 ul
= strtoul(buf
.buf
, &ptr
, 8);
526 if (ptr
== buf
.buf
|| *ptr
!= ' '
527 || errno
|| (unsigned int) ul
!= ul
)
531 tab
= strchr(ptr
, '\t');
532 if (!tab
|| tab
- ptr
< hexsz
+ 1)
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 */
542 ptr
= tab
+ 1; /* point at the head of path */
545 if (get_oid_hex(tab
- hexsz
, &oid
) ||
546 tab
[-(hexsz
+ 1)] != ' ')
550 if (!nul_term_line
&& path_name
[0] == '"') {
552 if (unquote_c_style(&uq
, path_name
, NULL
)) {
553 die("git update-index: bad quoting of path name");
558 if (!verify_path(path_name
, mode
)) {
559 fprintf(stderr
, "Ignoring path %s\n", path_name
);
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",
570 /* mode ' ' sha1 '\t' name
571 * ptr[-1] points at tab,
572 * ptr[-41] is at the beginning of sha1
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",
582 die("malformed index info %s", buf
.buf
);
584 strbuf_release(&buf
);
588 static const char * const update_index_usage
[] = {
589 N_("git update-index [<options>] [--] [<file>...]"),
593 static struct object_id head_oid
;
594 static struct object_id merge_head_oid
;
596 static struct cache_entry
*read_one_ent(const char *which
,
597 struct object_id
*ent
, const char *path
,
598 int namelen
, int stage
)
601 struct object_id oid
;
602 struct cache_entry
*ce
;
604 if (get_tree_entry(the_repository
, ent
, path
, &oid
, &mode
)) {
606 error("%s: not in %s branch.", path
, which
);
609 if (!the_index
.sparse_index
&& mode
== S_IFDIR
) {
611 error("%s: not a blob in %s branch.", path
, which
);
614 ce
= make_empty_cache_entry(&the_index
, namelen
);
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
);
624 static int unresolve_one(const char *path
)
626 int namelen
= strlen(path
);
629 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
631 /* See if there is such entry in the index. */
632 pos
= cache_name_pos(path
, namelen
);
635 pos
= unmerge_cache_entry_at(pos
);
636 if (pos
< active_nr
) {
637 const struct cache_entry
*ce
= active_cache
[pos
];
639 ce_namelen(ce
) == namelen
&&
640 !memcmp(ce
->name
, path
, namelen
))
643 /* no resolve-undo information; fall back */
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.
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
)) {
655 "%s: skipping still unmerged path.\n",
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.
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);
669 if (!ce_2
|| !ce_3
) {
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",
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
);
686 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
688 error("%s: cannot add their version to the index.", path
);
691 discard_cache_entry(ce_2
);
692 discard_cache_entry(ce_3
);
696 static void read_head_pointers(void)
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");
706 static int do_unresolve(int ac
, const char **av
,
707 const char *prefix
, int prefix_length
)
712 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
713 * are not doing a merge, so exit with success status.
715 read_head_pointers();
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
);
726 static int do_reupdate(int ac
, const char **av
,
729 /* Read HEAD and run update-index on paths that are
730 * merged and already different between index and HEAD.
734 struct pathspec pathspec
;
736 parse_pathspec(&pathspec
, 0,
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.
746 for (pos
= 0; pos
< active_nr
; pos
++) {
747 const struct cache_entry
*ce
= active_cache
[pos
];
748 struct cache_entry
*old
= NULL
;
752 if (ce_stage(ce
) || !ce_path_match(&the_index
, ce
, &pathspec
, NULL
))
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 */
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
767 if (S_ISSPARSEDIR(ce
->ce_mode
)) {
768 ensure_full_index(&the_index
);
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.
777 path
= xstrdup(ce
->name
);
780 discard_cache_entry(old
);
781 if (save_nr
!= active_nr
)
784 clear_pathspec(&pathspec
);
788 struct refresh_params
{
793 static int refresh(struct refresh_params
*o
, unsigned int flag
)
797 *o
->has_errors
|= refresh_cache(o
->flags
| flag
);
798 if (has_racy_timestamp(&the_index
)) {
800 * Even if nothing else has changed, updating the file
801 * increases the chance that racy timestamps become
802 * non-racy, helping future run-time performance.
803 * We do that even in case of "errors" returned by
804 * refresh_cache() as these are no actual errors.
805 * cmd_status() does the same.
807 active_cache_changed
|= SOMETHING_CHANGED
;
812 static int refresh_callback(const struct option
*opt
,
813 const char *arg
, int unset
)
815 BUG_ON_OPT_NEG(unset
);
817 return refresh(opt
->value
, 0);
820 static int really_refresh_callback(const struct option
*opt
,
821 const char *arg
, int unset
)
823 BUG_ON_OPT_NEG(unset
);
825 return refresh(opt
->value
, REFRESH_REALLY
);
828 static int chmod_callback(const struct option
*opt
,
829 const char *arg
, int unset
)
831 char *flip
= opt
->value
;
832 BUG_ON_OPT_NEG(unset
);
833 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
834 return error("option 'chmod' expects \"+x\" or \"-x\"");
839 static int resolve_undo_clear_callback(const struct option
*opt
,
840 const char *arg
, int unset
)
842 BUG_ON_OPT_NEG(unset
);
844 resolve_undo_clear();
848 static int parse_new_style_cacheinfo(const char *arg
,
850 struct object_id
*oid
,
861 ul
= strtoul(arg
, &endp
, 8);
862 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
863 return -1; /* not a new-style cacheinfo */
866 if (parse_oid_hex(endp
, oid
, &p
) || *p
!= ',')
872 static enum parse_opt_result
cacheinfo_callback(
873 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
874 const char *arg
, int unset
)
876 struct object_id oid
;
880 BUG_ON_OPT_NEG(unset
);
883 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, &oid
, &path
)) {
884 if (add_cacheinfo(mode
, &oid
, path
, 0))
885 die("git update-index: --cacheinfo cannot add %s", path
);
891 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
892 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
893 get_oid_hex(*++ctx
->argv
, &oid
) ||
894 add_cacheinfo(mode
, &oid
, *++ctx
->argv
, 0))
895 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
900 static enum parse_opt_result
stdin_cacheinfo_callback(
901 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
902 const char *arg
, int unset
)
904 int *nul_term_line
= opt
->value
;
906 BUG_ON_OPT_NEG(unset
);
910 return error("option '%s' must be the last argument", opt
->long_name
);
911 allow_add
= allow_replace
= allow_remove
= 1;
912 read_index_info(*nul_term_line
);
916 static enum parse_opt_result
stdin_callback(
917 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
918 const char *arg
, int unset
)
920 int *read_from_stdin
= opt
->value
;
922 BUG_ON_OPT_NEG(unset
);
926 return error("option '%s' must be the last argument", opt
->long_name
);
927 *read_from_stdin
= 1;
931 static enum parse_opt_result
unresolve_callback(
932 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
933 const char *arg
, int unset
)
935 int *has_errors
= opt
->value
;
936 const char *prefix
= startup_info
->prefix
;
938 BUG_ON_OPT_NEG(unset
);
941 /* consume remaining arguments. */
942 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
943 prefix
, prefix
? strlen(prefix
) : 0);
945 active_cache_changed
= 0;
947 ctx
->argv
+= ctx
->argc
- 1;
952 static enum parse_opt_result
reupdate_callback(
953 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
954 const char *arg
, int unset
)
956 int *has_errors
= opt
->value
;
957 const char *prefix
= startup_info
->prefix
;
959 BUG_ON_OPT_NEG(unset
);
962 /* consume remaining arguments. */
964 *has_errors
= do_reupdate(ctx
->argc
, ctx
->argv
, prefix
);
966 active_cache_changed
= 0;
968 ctx
->argv
+= ctx
->argc
- 1;
973 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
975 int newfd
, entries
, has_errors
= 0, nul_term_line
= 0;
976 enum uc_mode untracked_cache
= UC_UNSPECIFIED
;
977 int read_from_stdin
= 0;
978 int prefix_length
= prefix
? strlen(prefix
) : 0;
979 int preferred_index_format
= 0;
980 char set_executable_bit
= 0;
981 struct refresh_params refresh_args
= {0, &has_errors
};
983 int split_index
= -1;
986 struct lock_file lock_file
= LOCK_INIT
;
987 struct parse_opt_ctx_t ctx
;
988 strbuf_getline_fn getline_fn
;
989 int parseopt_state
= PARSE_OPT_UNKNOWN
;
990 struct repository
*r
= the_repository
;
991 struct option options
[] = {
992 OPT_BIT('q', NULL
, &refresh_args
.flags
,
993 N_("continue refresh even when index needs update"),
995 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
996 N_("refresh: ignore submodules"),
997 REFRESH_IGNORE_SUBMODULES
),
998 OPT_SET_INT(0, "add", &allow_add
,
999 N_("do not ignore new files"), 1),
1000 OPT_SET_INT(0, "replace", &allow_replace
,
1001 N_("let files replace directories and vice-versa"), 1),
1002 OPT_SET_INT(0, "remove", &allow_remove
,
1003 N_("notice files missing from worktree"), 1),
1004 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
1005 N_("refresh even if index contains unmerged entries"),
1007 OPT_CALLBACK_F(0, "refresh", &refresh_args
, NULL
,
1008 N_("refresh stat information"),
1009 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1011 OPT_CALLBACK_F(0, "really-refresh", &refresh_args
, NULL
,
1012 N_("like --refresh, but ignore assume-unchanged setting"),
1013 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1014 really_refresh_callback
),
1015 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
1016 N_("<mode>,<object>,<path>"),
1017 N_("add the specified entry to the index"),
1018 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
1019 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
1021 cacheinfo_callback
},
1022 OPT_CALLBACK_F(0, "chmod", &set_executable_bit
, "(+|-)x",
1023 N_("override the executable bit of the listed files"),
1026 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
1027 N_("mark files as \"not changing\""),
1028 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1029 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
1030 N_("clear assumed-unchanged bit"),
1031 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1032 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
1033 N_("mark files as \"index-only\""),
1034 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1035 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
1036 N_("clear skip-worktree bit"),
1037 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1038 OPT_BOOL(0, "ignore-skip-worktree-entries", &ignore_skip_worktree_entries
,
1039 N_("do not touch index-only entries")),
1040 OPT_SET_INT(0, "info-only", &info_only
,
1041 N_("add to index only; do not add content to object database"), 1),
1042 OPT_SET_INT(0, "force-remove", &force_remove
,
1043 N_("remove named paths even if present in worktree"), 1),
1044 OPT_BOOL('z', NULL
, &nul_term_line
,
1045 N_("with --stdin: input lines are terminated by null bytes")),
1046 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
1047 N_("read list of paths to be updated from standard input"),
1048 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1049 NULL
, 0, stdin_callback
},
1050 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &nul_term_line
, NULL
,
1051 N_("add entries from standard input to the index"),
1052 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1053 NULL
, 0, stdin_cacheinfo_callback
},
1054 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
1055 N_("repopulate stages #2 and #3 for the listed paths"),
1056 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1057 NULL
, 0, unresolve_callback
},
1058 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
1059 N_("only update entries that differ from HEAD"),
1060 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1061 NULL
, 0, reupdate_callback
},
1062 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
1063 N_("ignore files missing from worktree"),
1064 REFRESH_IGNORE_MISSING
),
1065 OPT_SET_INT(0, "verbose", &verbose
,
1066 N_("report actions to standard output"), 1),
1067 OPT_CALLBACK_F(0, "clear-resolve-undo", NULL
, NULL
,
1068 N_("(for porcelains) forget saved unresolved conflicts"),
1069 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1070 resolve_undo_clear_callback
),
1071 OPT_INTEGER(0, "index-version", &preferred_index_format
,
1072 N_("write index in this format")),
1073 OPT_BOOL(0, "split-index", &split_index
,
1074 N_("enable or disable split index")),
1075 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1076 N_("enable/disable untracked cache")),
1077 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache
,
1078 N_("test if the filesystem supports untracked cache"), UC_TEST
),
1079 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1080 N_("enable untracked cache without testing the filesystem"), UC_FORCE
),
1081 OPT_SET_INT(0, "force-write-index", &force_write
,
1082 N_("write out the index even if is not flagged as changed"), 1),
1083 OPT_BOOL(0, "fsmonitor", &fsmonitor
,
1084 N_("enable or disable file system monitor")),
1085 {OPTION_SET_INT
, 0, "fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1086 N_("mark files as fsmonitor valid"),
1087 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1088 {OPTION_SET_INT
, 0, "no-fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1089 N_("clear fsmonitor valid bit"),
1090 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1094 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1095 usage_with_options(update_index_usage
, options
);
1097 git_config(git_default_config
, NULL
);
1099 prepare_repo_settings(r
);
1100 the_repository
->settings
.command_requires_full_index
= 0;
1102 /* we will diagnose later if it turns out that we need to update it */
1103 newfd
= hold_locked_index(&lock_file
, 0);
1107 entries
= read_cache();
1109 die("cache corrupted");
1111 the_index
.updated_skipworktree
= 1;
1114 * Custom copy of parse_options() because we want to handle
1115 * filename arguments as they come.
1117 parse_options_start(&ctx
, argc
, argv
, prefix
,
1118 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
1120 if (parseopt_state
!= PARSE_OPT_DONE
)
1121 parseopt_state
= parse_options_step(&ctx
, options
,
1122 update_index_usage
);
1125 switch (parseopt_state
) {
1126 case PARSE_OPT_HELP
:
1127 case PARSE_OPT_ERROR
:
1129 case PARSE_OPT_COMPLETE
:
1131 case PARSE_OPT_NON_OPTION
:
1132 case PARSE_OPT_DONE
:
1134 const char *path
= ctx
.argv
[0];
1138 p
= prefix_path(prefix
, prefix_length
, path
);
1140 if (set_executable_bit
)
1141 chmod_path(set_executable_bit
, p
);
1147 case PARSE_OPT_UNKNOWN
:
1148 if (ctx
.argv
[0][1] == '-')
1149 error("unknown option '%s'", ctx
.argv
[0] + 2);
1151 error("unknown switch '%c'", *ctx
.opt
);
1152 usage_with_options(update_index_usage
, options
);
1155 argc
= parse_options_end(&ctx
);
1157 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
1158 if (preferred_index_format
) {
1159 if (preferred_index_format
< INDEX_FORMAT_LB
||
1160 INDEX_FORMAT_UB
< preferred_index_format
)
1161 die("index-version %d not in range: %d..%d",
1162 preferred_index_format
,
1163 INDEX_FORMAT_LB
, INDEX_FORMAT_UB
);
1165 if (the_index
.version
!= preferred_index_format
)
1166 active_cache_changed
|= SOMETHING_CHANGED
;
1167 the_index
.version
= preferred_index_format
;
1170 if (read_from_stdin
) {
1171 struct strbuf buf
= STRBUF_INIT
;
1172 struct strbuf unquoted
= STRBUF_INIT
;
1175 while (getline_fn(&buf
, stdin
) != EOF
) {
1177 if (!nul_term_line
&& buf
.buf
[0] == '"') {
1178 strbuf_reset(&unquoted
);
1179 if (unquote_c_style(&unquoted
, buf
.buf
, NULL
))
1180 die("line is badly quoted");
1181 strbuf_swap(&buf
, &unquoted
);
1183 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
1185 if (set_executable_bit
)
1186 chmod_path(set_executable_bit
, p
);
1189 strbuf_release(&unquoted
);
1190 strbuf_release(&buf
);
1193 if (split_index
> 0) {
1194 if (git_config_get_split_index() == 0)
1195 warning(_("core.splitIndex is set to false; "
1196 "remove or change it, if you really want to "
1197 "enable split index"));
1198 if (the_index
.split_index
)
1199 the_index
.cache_changed
|= SPLIT_INDEX_ORDERED
;
1201 add_split_index(&the_index
);
1202 } else if (!split_index
) {
1203 if (git_config_get_split_index() == 1)
1204 warning(_("core.splitIndex is set to true; "
1205 "remove or change it, if you really want to "
1206 "disable split index"));
1207 remove_split_index(&the_index
);
1210 prepare_repo_settings(r
);
1211 switch (untracked_cache
) {
1212 case UC_UNSPECIFIED
:
1215 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_WRITE
)
1216 warning(_("core.untrackedCache is set to true; "
1217 "remove or change it, if you really want to "
1218 "disable the untracked cache"));
1219 remove_untracked_cache(&the_index
);
1220 report(_("Untracked cache disabled"));
1224 return !test_if_untracked_cache_is_supported();
1227 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_REMOVE
)
1228 warning(_("core.untrackedCache is set to false; "
1229 "remove or change it, if you really want to "
1230 "enable the untracked cache"));
1231 add_untracked_cache(&the_index
);
1232 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1235 BUG("bad untracked_cache value: %d", untracked_cache
);
1238 if (fsmonitor
> 0) {
1239 enum fsmonitor_mode fsm_mode
= fsm_settings__get_mode(r
);
1240 enum fsmonitor_reason reason
= fsm_settings__get_reason(r
);
1243 * The user wants to turn on FSMonitor using the command
1244 * line argument. (We don't know (or care) whether that
1245 * is the IPC or HOOK version.)
1247 * Use one of the __get routines to force load the FSMonitor
1248 * config settings into the repo-settings. That will detect
1249 * whether the file system is compatible so that we can stop
1250 * here with a nice error message.
1252 if (reason
> FSMONITOR_REASON_OK
)
1254 fsm_settings__get_incompatible_msg(r
, reason
));
1256 if (fsm_mode
== FSMONITOR_MODE_DISABLED
) {
1257 warning(_("core.fsmonitor is unset; "
1258 "set it if you really want to "
1259 "enable fsmonitor"));
1261 add_fsmonitor(&the_index
);
1262 report(_("fsmonitor enabled"));
1263 } else if (!fsmonitor
) {
1264 enum fsmonitor_mode fsm_mode
= fsm_settings__get_mode(r
);
1265 if (fsm_mode
> FSMONITOR_MODE_DISABLED
)
1266 warning(_("core.fsmonitor is set; "
1267 "remove it if you really want to "
1268 "disable fsmonitor"));
1269 remove_fsmonitor(&the_index
);
1270 report(_("fsmonitor disabled"));
1273 if (active_cache_changed
|| force_write
) {
1275 if (refresh_args
.flags
& REFRESH_QUIET
)
1277 unable_to_lock_die(get_index_file(), lock_error
);
1279 if (write_locked_index(&the_index
, &lock_file
, COMMIT_LOCK
))
1280 die("Unable to write new index file");
1283 rollback_lock_file(&lock_file
);
1285 return has_errors
? 1 : 0;