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
= open(path
, O_CREAT
| O_RDWR
, 0644);
100 die_errno(_("failed to create file %s"), path
);
104 static void xunlink(const char *path
)
106 path
= get_mtime_path(path
);
108 die_errno(_("failed to delete file %s"), path
);
111 static void xrmdir(const char *path
)
113 path
= get_mtime_path(path
);
115 die_errno(_("failed to delete directory %s"), path
);
118 static void avoid_racy(void)
121 * not use if we could usleep(10) if USE_NSEC is defined. The
122 * field nsec could be there, but the OS could choose to
128 static int test_if_untracked_cache_is_supported(void)
131 struct stat_data base
;
135 strbuf_addstr(&mtime_dir
, "mtime-test-XXXXXX");
136 if (!mkdtemp(mtime_dir
.buf
))
137 die_errno("Could not make temporary directory");
140 fprintf(stderr
, _("Testing mtime in '%s' "), cwd
);
143 atexit(remove_test_directory
);
144 xstat_mtime_dir(&st
);
145 fill_stat_data(&base
, &st
);
149 fd
= create_file("newfile");
150 xstat_mtime_dir(&st
);
151 if (!match_stat_data(&base
, &st
)) {
154 fprintf_ln(stderr
,_("directory stat info does not "
155 "change after adding a new file"));
158 fill_stat_data(&base
, &st
);
163 xstat_mtime_dir(&st
);
164 if (!match_stat_data(&base
, &st
)) {
167 fprintf_ln(stderr
, _("directory stat info does not change "
168 "after adding a new directory"));
171 fill_stat_data(&base
, &st
);
175 write_or_die(fd
, "data", 4);
177 xstat_mtime_dir(&st
);
178 if (match_stat_data(&base
, &st
)) {
180 fprintf_ln(stderr
, _("directory stat info changes "
181 "after updating a file"));
187 close(create_file("new-dir/new"));
188 xstat_mtime_dir(&st
);
189 if (match_stat_data(&base
, &st
)) {
191 fprintf_ln(stderr
, _("directory stat info changes after "
192 "adding a file inside subdirectory"));
199 xstat_mtime_dir(&st
);
200 if (!match_stat_data(&base
, &st
)) {
202 fprintf_ln(stderr
, _("directory stat info does not "
203 "change after deleting a file"));
206 fill_stat_data(&base
, &st
);
210 xunlink("new-dir/new");
212 xstat_mtime_dir(&st
);
213 if (!match_stat_data(&base
, &st
)) {
215 fprintf_ln(stderr
, _("directory stat info does not "
216 "change after deleting a directory"));
220 if (rmdir(mtime_dir
.buf
))
221 die_errno(_("failed to delete directory %s"), mtime_dir
.buf
);
222 fprintf_ln(stderr
, _(" OK"));
226 strbuf_release(&mtime_dir
);
230 static int mark_ce_flags(const char *path
, int flag
, int mark
)
232 int namelen
= strlen(path
);
233 int pos
= cache_name_pos(path
, namelen
);
235 mark_fsmonitor_invalid(&the_index
, active_cache
[pos
]);
237 active_cache
[pos
]->ce_flags
|= flag
;
239 active_cache
[pos
]->ce_flags
&= ~flag
;
240 active_cache
[pos
]->ce_flags
|= CE_UPDATE_IN_BASE
;
241 cache_tree_invalidate_path(&the_index
, path
);
242 active_cache_changed
|= CE_ENTRY_CHANGED
;
248 static int remove_one_path(const char *path
)
251 return error("%s: does not exist and --remove not passed", path
);
252 if (remove_file_from_cache(path
))
253 return error("%s: cannot remove from the index", path
);
258 * Handle a path that couldn't be lstat'ed. It's either:
259 * - missing file (ENOENT or ENOTDIR). That's ok if we're
260 * supposed to be removing it and the removal actually
262 * - permission error. That's never ok.
264 static int process_lstat_error(const char *path
, int err
)
266 if (is_missing_file_error(err
))
267 return remove_one_path(path
);
268 return error("lstat(\"%s\"): %s", path
, strerror(err
));
271 static int add_one_path(const struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
274 struct cache_entry
*ce
;
276 /* Was the old index entry already up-to-date? */
277 if (old
&& !ce_stage(old
) && !ce_match_stat(old
, st
, 0))
280 ce
= make_empty_cache_entry(&the_index
, len
);
281 memcpy(ce
->name
, path
, len
);
282 ce
->ce_flags
= create_ce_flags(0);
283 ce
->ce_namelen
= len
;
284 fill_stat_cache_info(&the_index
, ce
, st
);
285 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
287 if (index_path(&the_index
, &ce
->oid
, path
, st
,
288 info_only
? 0 : HASH_WRITE_OBJECT
)) {
289 discard_cache_entry(ce
);
292 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
293 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
294 if (add_cache_entry(ce
, option
)) {
295 discard_cache_entry(ce
);
296 return error("%s: cannot add to the index - missing --add option?", path
);
302 * Handle a path that was a directory. Four cases:
304 * - it's already a gitlink in the index, and we keep it that
305 * way, and update it if we can (if we cannot find the HEAD,
306 * we're going to keep it unchanged in the index!)
308 * - it's a *file* in the index, in which case it should be
309 * removed as a file if removal is allowed, since it doesn't
310 * exist as such any more. If removal isn't allowed, it's
313 * (NOTE! This is old and arguably fairly strange behaviour.
314 * We might want to make this an error unconditionally, and
315 * use "--force-remove" if you actually want to force removal).
317 * - it used to exist as a subdirectory (ie multiple files with
318 * this particular prefix) in the index, in which case it's wrong
319 * to try to update it as a directory.
321 * - it doesn't exist at all in the index, but it is a valid
322 * git directory, and it should be *added* as a gitlink.
324 static int process_directory(const char *path
, int len
, struct stat
*st
)
326 struct object_id oid
;
327 int pos
= cache_name_pos(path
, len
);
329 /* Exact match: file or existing gitlink */
331 const struct cache_entry
*ce
= active_cache
[pos
];
332 if (S_ISGITLINK(ce
->ce_mode
)) {
334 /* Do nothing to the index if there is no HEAD! */
335 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
338 return add_one_path(ce
, path
, len
, st
);
340 /* Should this be an unconditional error? */
341 return remove_one_path(path
);
344 /* Inexact match: is there perhaps a subdirectory match? */
346 while (pos
< active_nr
) {
347 const struct cache_entry
*ce
= active_cache
[pos
++];
349 if (strncmp(ce
->name
, path
, len
))
351 if (ce
->name
[len
] > '/')
353 if (ce
->name
[len
] < '/')
356 /* Subdirectory match - error out */
357 return error("%s: is a directory - add individual files instead", path
);
360 /* No match - should we add it as a gitlink? */
361 if (!resolve_gitlink_ref(path
, "HEAD", &oid
))
362 return add_one_path(NULL
, path
, len
, st
);
365 return error("%s: is a directory - add files inside instead", path
);
368 static int process_path(const char *path
, struct stat
*st
, int stat_errno
)
371 const struct cache_entry
*ce
;
374 if (has_symlink_leading_path(path
, len
))
375 return error("'%s' is beyond a symbolic link", path
);
377 pos
= cache_name_pos(path
, len
);
378 ce
= pos
< 0 ? NULL
: active_cache
[pos
];
379 if (ce
&& ce_skip_worktree(ce
)) {
381 * working directory version is assumed "good"
382 * so updating it does not make sense.
383 * On the other hand, removing it from index should work
385 if (!ignore_skip_worktree_entries
&& allow_remove
&&
386 remove_file_from_cache(path
))
387 return error("%s: cannot remove from the index", path
);
392 * First things first: get the stat information, to decide
393 * what to do about the pathname!
396 return process_lstat_error(path
, stat_errno
);
398 if (S_ISDIR(st
->st_mode
))
399 return process_directory(path
, len
, st
);
401 return add_one_path(ce
, path
, len
, st
);
404 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
405 const char *path
, int stage
)
408 struct cache_entry
*ce
;
410 if (!verify_path(path
, mode
))
411 return error("Invalid path '%s'", path
);
414 ce
= make_empty_cache_entry(&the_index
, len
);
416 oidcpy(&ce
->oid
, oid
);
417 memcpy(ce
->name
, path
, len
);
418 ce
->ce_flags
= create_ce_flags(stage
);
419 ce
->ce_namelen
= len
;
420 ce
->ce_mode
= create_ce_mode(mode
);
421 if (assume_unchanged
)
422 ce
->ce_flags
|= CE_VALID
;
423 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
424 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
425 if (add_cache_entry(ce
, option
))
426 return error("%s: cannot add to the index - missing --add option?",
428 report("add '%s'", path
);
432 static void chmod_path(char flip
, const char *path
)
435 struct cache_entry
*ce
;
437 pos
= cache_name_pos(path
, strlen(path
));
440 ce
= active_cache
[pos
];
441 if (chmod_cache_entry(ce
, flip
) < 0)
444 report("chmod %cx '%s'", flip
, path
);
447 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
450 static void update_one(const char *path
)
455 if (mark_valid_only
|| mark_skip_worktree_only
|| force_remove
||
458 else if (lstat(path
, &st
) < 0) {
461 } /* else stat is valid */
463 if (!verify_path(path
, st
.st_mode
)) {
464 fprintf(stderr
, "Ignoring path %s\n", path
);
467 if (mark_valid_only
) {
468 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
469 die("Unable to mark file %s", path
);
472 if (mark_skip_worktree_only
) {
473 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
474 die("Unable to mark file %s", path
);
477 if (mark_fsmonitor_only
) {
478 if (mark_ce_flags(path
, CE_FSMONITOR_VALID
, mark_fsmonitor_only
== MARK_FLAG
))
479 die("Unable to mark file %s", path
);
484 if (remove_file_from_cache(path
))
485 die("git update-index: unable to remove %s", path
);
486 report("remove '%s'", path
);
489 if (process_path(path
, &st
, stat_errno
))
490 die("Unable to process path %s", path
);
491 report("add '%s'", path
);
494 static void read_index_info(int nul_term_line
)
496 const int hexsz
= the_hash_algo
->hexsz
;
497 struct strbuf buf
= STRBUF_INIT
;
498 struct strbuf uq
= STRBUF_INIT
;
499 strbuf_getline_fn getline_fn
;
501 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
502 while (getline_fn(&buf
, stdin
) != EOF
) {
505 struct object_id oid
;
510 /* This reads lines formatted in one of three formats:
512 * (1) mode SP sha1 TAB path
513 * The first format is what "git apply --index-info"
514 * reports, and used to reconstruct a partial tree
515 * that is used for phony merge base tree when falling
516 * back on 3-way merge.
518 * (2) mode SP type SP sha1 TAB path
519 * The second format is to stuff "git ls-tree" output
520 * into the index file.
522 * (3) mode SP sha1 SP stage TAB path
523 * This format is to put higher order stages into the
524 * index file and matches "git ls-files --stage" output.
527 ul
= strtoul(buf
.buf
, &ptr
, 8);
528 if (ptr
== buf
.buf
|| *ptr
!= ' '
529 || errno
|| (unsigned int) ul
!= ul
)
533 tab
= strchr(ptr
, '\t');
534 if (!tab
|| tab
- ptr
< hexsz
+ 1)
537 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
538 stage
= tab
[-1] - '0';
539 ptr
= tab
+ 1; /* point at the head of path */
540 tab
= tab
- 2; /* point at tail of sha1 */
544 ptr
= tab
+ 1; /* point at the head of path */
547 if (get_oid_hex(tab
- hexsz
, &oid
) ||
548 tab
[-(hexsz
+ 1)] != ' ')
552 if (!nul_term_line
&& path_name
[0] == '"') {
554 if (unquote_c_style(&uq
, path_name
, NULL
)) {
555 die("git update-index: bad quoting of path name");
560 if (!verify_path(path_name
, mode
)) {
561 fprintf(stderr
, "Ignoring path %s\n", path_name
);
566 /* mode == 0 means there is no such path -- remove */
567 if (remove_file_from_cache(path_name
))
568 die("git update-index: unable to remove %s",
572 /* mode ' ' sha1 '\t' name
573 * ptr[-1] points at tab,
574 * ptr[-41] is at the beginning of sha1
576 ptr
[-(hexsz
+ 2)] = ptr
[-1] = 0;
577 if (add_cacheinfo(mode
, &oid
, path_name
, stage
))
578 die("git update-index: unable to update %s",
584 die("malformed index info %s", buf
.buf
);
586 strbuf_release(&buf
);
590 static const char * const update_index_usage
[] = {
591 N_("git update-index [<options>] [--] [<file>...]"),
595 static struct object_id head_oid
;
596 static struct object_id merge_head_oid
;
598 static struct cache_entry
*read_one_ent(const char *which
,
599 struct object_id
*ent
, const char *path
,
600 int namelen
, int stage
)
603 struct object_id oid
;
604 struct cache_entry
*ce
;
606 if (get_tree_entry(the_repository
, ent
, path
, &oid
, &mode
)) {
608 error("%s: not in %s branch.", path
, which
);
611 if (mode
== S_IFDIR
) {
613 error("%s: not a blob in %s branch.", path
, which
);
616 ce
= make_empty_cache_entry(&the_index
, namelen
);
618 oidcpy(&ce
->oid
, &oid
);
619 memcpy(ce
->name
, path
, namelen
);
620 ce
->ce_flags
= create_ce_flags(stage
);
621 ce
->ce_namelen
= namelen
;
622 ce
->ce_mode
= create_ce_mode(mode
);
626 static int unresolve_one(const char *path
)
628 int namelen
= strlen(path
);
631 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
633 /* See if there is such entry in the index. */
634 pos
= cache_name_pos(path
, namelen
);
637 pos
= unmerge_cache_entry_at(pos
);
638 if (pos
< active_nr
) {
639 const struct cache_entry
*ce
= active_cache
[pos
];
641 ce_namelen(ce
) == namelen
&&
642 !memcmp(ce
->name
, path
, namelen
))
645 /* no resolve-undo information; fall back */
647 /* If there isn't, either it is unmerged, or
648 * resolved as "removed" by mistake. We do not
649 * want to do anything in the former case.
652 if (pos
< active_nr
) {
653 const struct cache_entry
*ce
= active_cache
[pos
];
654 if (ce_namelen(ce
) == namelen
&&
655 !memcmp(ce
->name
, path
, namelen
)) {
657 "%s: skipping still unmerged path.\n",
664 /* Grab blobs from given path from HEAD and MERGE_HEAD,
665 * stuff HEAD version in stage #2,
666 * stuff MERGE_HEAD version in stage #3.
668 ce_2
= read_one_ent("our", &head_oid
, path
, namelen
, 2);
669 ce_3
= read_one_ent("their", &merge_head_oid
, path
, namelen
, 3);
671 if (!ce_2
|| !ce_3
) {
675 if (oideq(&ce_2
->oid
, &ce_3
->oid
) &&
676 ce_2
->ce_mode
== ce_3
->ce_mode
) {
677 fprintf(stderr
, "%s: identical in both, skipping.\n",
682 remove_file_from_cache(path
);
683 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
684 error("%s: cannot add our version to the index.", path
);
688 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
690 error("%s: cannot add their version to the index.", path
);
693 discard_cache_entry(ce_2
);
694 discard_cache_entry(ce_3
);
698 static void read_head_pointers(void)
700 if (read_ref("HEAD", &head_oid
))
701 die("No HEAD -- no initial commit yet?");
702 if (read_ref("MERGE_HEAD", &merge_head_oid
)) {
703 fprintf(stderr
, "Not in the middle of a merge.\n");
708 static int do_unresolve(int ac
, const char **av
,
709 const char *prefix
, int prefix_length
)
714 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
715 * are not doing a merge, so exit with success status.
717 read_head_pointers();
719 for (i
= 1; i
< ac
; i
++) {
720 const char *arg
= av
[i
];
721 char *p
= prefix_path(prefix
, prefix_length
, arg
);
722 err
|= unresolve_one(p
);
728 static int do_reupdate(int ac
, const char **av
,
731 /* Read HEAD and run update-index on paths that are
732 * merged and already different between index and HEAD.
736 struct pathspec pathspec
;
738 parse_pathspec(&pathspec
, 0,
742 if (read_ref("HEAD", &head_oid
))
743 /* If there is no HEAD, that means it is an initial
744 * commit. Update everything in the index.
748 for (pos
= 0; pos
< active_nr
; pos
++) {
749 const struct cache_entry
*ce
= active_cache
[pos
];
750 struct cache_entry
*old
= NULL
;
754 if (ce_stage(ce
) || !ce_path_match(&the_index
, ce
, &pathspec
, NULL
))
757 old
= read_one_ent(NULL
, &head_oid
,
758 ce
->name
, ce_namelen(ce
), 0);
759 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
760 oideq(&ce
->oid
, &old
->oid
)) {
761 discard_cache_entry(old
);
762 continue; /* unchanged */
764 /* Be careful. The working tree may not have the
765 * path anymore, in which case, under 'allow_remove',
766 * or worse yet 'allow_replace', active_nr may decrease.
769 path
= xstrdup(ce
->name
);
772 discard_cache_entry(old
);
773 if (save_nr
!= active_nr
)
776 clear_pathspec(&pathspec
);
780 struct refresh_params
{
785 static int refresh(struct refresh_params
*o
, unsigned int flag
)
789 *o
->has_errors
|= refresh_cache(o
->flags
| flag
);
793 static int refresh_callback(const struct option
*opt
,
794 const char *arg
, int unset
)
796 BUG_ON_OPT_NEG(unset
);
798 return refresh(opt
->value
, 0);
801 static int really_refresh_callback(const struct option
*opt
,
802 const char *arg
, int unset
)
804 BUG_ON_OPT_NEG(unset
);
806 return refresh(opt
->value
, REFRESH_REALLY
);
809 static int chmod_callback(const struct option
*opt
,
810 const char *arg
, int unset
)
812 char *flip
= opt
->value
;
813 BUG_ON_OPT_NEG(unset
);
814 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
815 return error("option 'chmod' expects \"+x\" or \"-x\"");
820 static int resolve_undo_clear_callback(const struct option
*opt
,
821 const char *arg
, int unset
)
823 BUG_ON_OPT_NEG(unset
);
825 resolve_undo_clear();
829 static int parse_new_style_cacheinfo(const char *arg
,
831 struct object_id
*oid
,
842 ul
= strtoul(arg
, &endp
, 8);
843 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
844 return -1; /* not a new-style cacheinfo */
847 if (parse_oid_hex(endp
, oid
, &p
) || *p
!= ',')
853 static enum parse_opt_result
cacheinfo_callback(
854 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
855 const char *arg
, int unset
)
857 struct object_id oid
;
861 BUG_ON_OPT_NEG(unset
);
864 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, &oid
, &path
)) {
865 if (add_cacheinfo(mode
, &oid
, path
, 0))
866 die("git update-index: --cacheinfo cannot add %s", path
);
872 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
873 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
874 get_oid_hex(*++ctx
->argv
, &oid
) ||
875 add_cacheinfo(mode
, &oid
, *++ctx
->argv
, 0))
876 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
881 static enum parse_opt_result
stdin_cacheinfo_callback(
882 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
883 const char *arg
, int unset
)
885 int *nul_term_line
= opt
->value
;
887 BUG_ON_OPT_NEG(unset
);
891 return error("option '%s' must be the last argument", opt
->long_name
);
892 allow_add
= allow_replace
= allow_remove
= 1;
893 read_index_info(*nul_term_line
);
897 static enum parse_opt_result
stdin_callback(
898 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
899 const char *arg
, int unset
)
901 int *read_from_stdin
= opt
->value
;
903 BUG_ON_OPT_NEG(unset
);
907 return error("option '%s' must be the last argument", opt
->long_name
);
908 *read_from_stdin
= 1;
912 static enum parse_opt_result
unresolve_callback(
913 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
914 const char *arg
, int unset
)
916 int *has_errors
= opt
->value
;
917 const char *prefix
= startup_info
->prefix
;
919 BUG_ON_OPT_NEG(unset
);
922 /* consume remaining arguments. */
923 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
924 prefix
, prefix
? strlen(prefix
) : 0);
926 active_cache_changed
= 0;
928 ctx
->argv
+= ctx
->argc
- 1;
933 static enum parse_opt_result
reupdate_callback(
934 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
935 const char *arg
, int unset
)
937 int *has_errors
= opt
->value
;
938 const char *prefix
= startup_info
->prefix
;
940 BUG_ON_OPT_NEG(unset
);
943 /* consume remaining arguments. */
945 *has_errors
= do_reupdate(ctx
->argc
, ctx
->argv
, prefix
);
947 active_cache_changed
= 0;
949 ctx
->argv
+= ctx
->argc
- 1;
954 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
956 int newfd
, entries
, has_errors
= 0, nul_term_line
= 0;
957 enum uc_mode untracked_cache
= UC_UNSPECIFIED
;
958 int read_from_stdin
= 0;
959 int prefix_length
= prefix
? strlen(prefix
) : 0;
960 int preferred_index_format
= 0;
961 char set_executable_bit
= 0;
962 struct refresh_params refresh_args
= {0, &has_errors
};
964 int split_index
= -1;
967 struct lock_file lock_file
= LOCK_INIT
;
968 struct parse_opt_ctx_t ctx
;
969 strbuf_getline_fn getline_fn
;
970 int parseopt_state
= PARSE_OPT_UNKNOWN
;
971 struct repository
*r
= the_repository
;
972 struct option options
[] = {
973 OPT_BIT('q', NULL
, &refresh_args
.flags
,
974 N_("continue refresh even when index needs update"),
976 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
977 N_("refresh: ignore submodules"),
978 REFRESH_IGNORE_SUBMODULES
),
979 OPT_SET_INT(0, "add", &allow_add
,
980 N_("do not ignore new files"), 1),
981 OPT_SET_INT(0, "replace", &allow_replace
,
982 N_("let files replace directories and vice-versa"), 1),
983 OPT_SET_INT(0, "remove", &allow_remove
,
984 N_("notice files missing from worktree"), 1),
985 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
986 N_("refresh even if index contains unmerged entries"),
988 OPT_CALLBACK_F(0, "refresh", &refresh_args
, NULL
,
989 N_("refresh stat information"),
990 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
992 OPT_CALLBACK_F(0, "really-refresh", &refresh_args
, NULL
,
993 N_("like --refresh, but ignore assume-unchanged setting"),
994 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
995 really_refresh_callback
),
996 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
997 N_("<mode>,<object>,<path>"),
998 N_("add the specified entry to the index"),
999 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
1000 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
1002 cacheinfo_callback
},
1003 OPT_CALLBACK_F(0, "chmod", &set_executable_bit
, "(+|-)x",
1004 N_("override the executable bit of the listed files"),
1007 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
1008 N_("mark files as \"not changing\""),
1009 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1010 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
1011 N_("clear assumed-unchanged bit"),
1012 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1013 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
1014 N_("mark files as \"index-only\""),
1015 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1016 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
1017 N_("clear skip-worktree bit"),
1018 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1019 OPT_BOOL(0, "ignore-skip-worktree-entries", &ignore_skip_worktree_entries
,
1020 N_("do not touch index-only entries")),
1021 OPT_SET_INT(0, "info-only", &info_only
,
1022 N_("add to index only; do not add content to object database"), 1),
1023 OPT_SET_INT(0, "force-remove", &force_remove
,
1024 N_("remove named paths even if present in worktree"), 1),
1025 OPT_BOOL('z', NULL
, &nul_term_line
,
1026 N_("with --stdin: input lines are terminated by null bytes")),
1027 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
1028 N_("read list of paths to be updated from standard input"),
1029 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1030 NULL
, 0, stdin_callback
},
1031 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &nul_term_line
, NULL
,
1032 N_("add entries from standard input to the index"),
1033 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1034 NULL
, 0, stdin_cacheinfo_callback
},
1035 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
1036 N_("repopulate stages #2 and #3 for the listed paths"),
1037 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1038 NULL
, 0, unresolve_callback
},
1039 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
1040 N_("only update entries that differ from HEAD"),
1041 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1042 NULL
, 0, reupdate_callback
},
1043 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
1044 N_("ignore files missing from worktree"),
1045 REFRESH_IGNORE_MISSING
),
1046 OPT_SET_INT(0, "verbose", &verbose
,
1047 N_("report actions to standard output"), 1),
1048 OPT_CALLBACK_F(0, "clear-resolve-undo", NULL
, NULL
,
1049 N_("(for porcelains) forget saved unresolved conflicts"),
1050 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1051 resolve_undo_clear_callback
),
1052 OPT_INTEGER(0, "index-version", &preferred_index_format
,
1053 N_("write index in this format")),
1054 OPT_BOOL(0, "split-index", &split_index
,
1055 N_("enable or disable split index")),
1056 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1057 N_("enable/disable untracked cache")),
1058 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache
,
1059 N_("test if the filesystem supports untracked cache"), UC_TEST
),
1060 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1061 N_("enable untracked cache without testing the filesystem"), UC_FORCE
),
1062 OPT_SET_INT(0, "force-write-index", &force_write
,
1063 N_("write out the index even if is not flagged as changed"), 1),
1064 OPT_BOOL(0, "fsmonitor", &fsmonitor
,
1065 N_("enable or disable file system monitor")),
1066 {OPTION_SET_INT
, 0, "fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1067 N_("mark files as fsmonitor valid"),
1068 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1069 {OPTION_SET_INT
, 0, "no-fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1070 N_("clear fsmonitor valid bit"),
1071 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1075 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1076 usage_with_options(update_index_usage
, options
);
1078 git_config(git_default_config
, NULL
);
1080 /* we will diagnose later if it turns out that we need to update it */
1081 newfd
= hold_locked_index(&lock_file
, 0);
1085 entries
= read_cache();
1087 die("cache corrupted");
1089 the_index
.updated_skipworktree
= 1;
1092 * Custom copy of parse_options() because we want to handle
1093 * filename arguments as they come.
1095 parse_options_start(&ctx
, argc
, argv
, prefix
,
1096 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
1098 if (parseopt_state
!= PARSE_OPT_DONE
)
1099 parseopt_state
= parse_options_step(&ctx
, options
,
1100 update_index_usage
);
1103 switch (parseopt_state
) {
1104 case PARSE_OPT_HELP
:
1105 case PARSE_OPT_ERROR
:
1107 case PARSE_OPT_COMPLETE
:
1109 case PARSE_OPT_NON_OPTION
:
1110 case PARSE_OPT_DONE
:
1112 const char *path
= ctx
.argv
[0];
1116 p
= prefix_path(prefix
, prefix_length
, path
);
1118 if (set_executable_bit
)
1119 chmod_path(set_executable_bit
, p
);
1125 case PARSE_OPT_UNKNOWN
:
1126 if (ctx
.argv
[0][1] == '-')
1127 error("unknown option '%s'", ctx
.argv
[0] + 2);
1129 error("unknown switch '%c'", *ctx
.opt
);
1130 usage_with_options(update_index_usage
, options
);
1133 argc
= parse_options_end(&ctx
);
1135 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
1136 if (preferred_index_format
) {
1137 if (preferred_index_format
< INDEX_FORMAT_LB
||
1138 INDEX_FORMAT_UB
< preferred_index_format
)
1139 die("index-version %d not in range: %d..%d",
1140 preferred_index_format
,
1141 INDEX_FORMAT_LB
, INDEX_FORMAT_UB
);
1143 if (the_index
.version
!= preferred_index_format
)
1144 active_cache_changed
|= SOMETHING_CHANGED
;
1145 the_index
.version
= preferred_index_format
;
1148 if (read_from_stdin
) {
1149 struct strbuf buf
= STRBUF_INIT
;
1150 struct strbuf unquoted
= STRBUF_INIT
;
1153 while (getline_fn(&buf
, stdin
) != EOF
) {
1155 if (!nul_term_line
&& buf
.buf
[0] == '"') {
1156 strbuf_reset(&unquoted
);
1157 if (unquote_c_style(&unquoted
, buf
.buf
, NULL
))
1158 die("line is badly quoted");
1159 strbuf_swap(&buf
, &unquoted
);
1161 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
1163 if (set_executable_bit
)
1164 chmod_path(set_executable_bit
, p
);
1167 strbuf_release(&unquoted
);
1168 strbuf_release(&buf
);
1171 if (split_index
> 0) {
1172 if (git_config_get_split_index() == 0)
1173 warning(_("core.splitIndex is set to false; "
1174 "remove or change it, if you really want to "
1175 "enable split index"));
1176 if (the_index
.split_index
)
1177 the_index
.cache_changed
|= SPLIT_INDEX_ORDERED
;
1179 add_split_index(&the_index
);
1180 } else if (!split_index
) {
1181 if (git_config_get_split_index() == 1)
1182 warning(_("core.splitIndex is set to true; "
1183 "remove or change it, if you really want to "
1184 "disable split index"));
1185 remove_split_index(&the_index
);
1188 prepare_repo_settings(r
);
1189 switch (untracked_cache
) {
1190 case UC_UNSPECIFIED
:
1193 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_WRITE
)
1194 warning(_("core.untrackedCache is set to true; "
1195 "remove or change it, if you really want to "
1196 "disable the untracked cache"));
1197 remove_untracked_cache(&the_index
);
1198 report(_("Untracked cache disabled"));
1202 return !test_if_untracked_cache_is_supported();
1205 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_REMOVE
)
1206 warning(_("core.untrackedCache is set to false; "
1207 "remove or change it, if you really want to "
1208 "enable the untracked cache"));
1209 add_untracked_cache(&the_index
);
1210 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1213 BUG("bad untracked_cache value: %d", untracked_cache
);
1216 if (fsmonitor
> 0) {
1217 if (git_config_get_fsmonitor() == 0)
1218 warning(_("core.fsmonitor is unset; "
1219 "set it if you really want to "
1220 "enable fsmonitor"));
1221 add_fsmonitor(&the_index
);
1222 report(_("fsmonitor enabled"));
1223 } else if (!fsmonitor
) {
1224 if (git_config_get_fsmonitor() == 1)
1225 warning(_("core.fsmonitor is set; "
1226 "remove it if you really want to "
1227 "disable fsmonitor"));
1228 remove_fsmonitor(&the_index
);
1229 report(_("fsmonitor disabled"));
1232 if (active_cache_changed
|| force_write
) {
1234 if (refresh_args
.flags
& REFRESH_QUIET
)
1236 unable_to_lock_die(get_index_file(), lock_error
);
1238 if (write_locked_index(&the_index
, &lock_file
, COMMIT_LOCK
))
1239 die("Unable to write new index file");
1242 rollback_lock_file(&lock_file
);
1244 return has_errors
? 1 : 0;