2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
9 #include "cache-tree.h"
10 #include "tree-walk.h"
13 #include "resolve-undo.h"
14 #include "parse-options.h"
17 #include "split-index.h"
20 * Default to not allowing changes to the list of files. The
21 * tool doesn't actually care, but this makes it harder to add
22 * files to the revision control by mistake by doing something
23 * like "git update-index *" and suddenly having all the object
24 * files be revision controlled.
27 static int allow_remove
;
28 static int allow_replace
;
30 static int force_remove
;
32 static int mark_valid_only
;
33 static int mark_skip_worktree_only
;
36 static struct strbuf mtime_dir
= STRBUF_INIT
;
38 /* Untracked cache mode */
47 __attribute__((format (printf
, 1, 2)))
48 static void report(const char *fmt
, ...)
61 static void remove_test_directory(void)
64 remove_dir_recursively(&mtime_dir
, 0);
67 static const char *get_mtime_path(const char *path
)
69 static struct strbuf sb
= STRBUF_INIT
;
71 strbuf_addf(&sb
, "%s/%s", mtime_dir
.buf
, path
);
75 static void xmkdir(const char *path
)
77 path
= get_mtime_path(path
);
78 if (mkdir(path
, 0700))
79 die_errno(_("failed to create directory %s"), path
);
82 static int xstat_mtime_dir(struct stat
*st
)
84 if (stat(mtime_dir
.buf
, st
))
85 die_errno(_("failed to stat %s"), mtime_dir
.buf
);
89 static int create_file(const char *path
)
92 path
= get_mtime_path(path
);
93 fd
= open(path
, O_CREAT
| O_RDWR
, 0644);
95 die_errno(_("failed to create file %s"), path
);
99 static void xunlink(const char *path
)
101 path
= get_mtime_path(path
);
103 die_errno(_("failed to delete file %s"), path
);
106 static void xrmdir(const char *path
)
108 path
= get_mtime_path(path
);
110 die_errno(_("failed to delete directory %s"), path
);
113 static void avoid_racy(void)
116 * not use if we could usleep(10) if USE_NSEC is defined. The
117 * field nsec could be there, but the OS could choose to
123 static int test_if_untracked_cache_is_supported(void)
126 struct stat_data base
;
130 strbuf_addstr(&mtime_dir
, "mtime-test-XXXXXX");
131 if (!mkdtemp(mtime_dir
.buf
))
132 die_errno("Could not make temporary directory");
135 fprintf(stderr
, _("Testing mtime in '%s' "), cwd
);
138 atexit(remove_test_directory
);
139 xstat_mtime_dir(&st
);
140 fill_stat_data(&base
, &st
);
144 fd
= create_file("newfile");
145 xstat_mtime_dir(&st
);
146 if (!match_stat_data(&base
, &st
)) {
149 fprintf_ln(stderr
,_("directory stat info does not "
150 "change after adding a new file"));
153 fill_stat_data(&base
, &st
);
158 xstat_mtime_dir(&st
);
159 if (!match_stat_data(&base
, &st
)) {
162 fprintf_ln(stderr
, _("directory stat info does not change "
163 "after adding a new directory"));
166 fill_stat_data(&base
, &st
);
170 write_or_die(fd
, "data", 4);
172 xstat_mtime_dir(&st
);
173 if (match_stat_data(&base
, &st
)) {
175 fprintf_ln(stderr
, _("directory stat info changes "
176 "after updating a file"));
182 close(create_file("new-dir/new"));
183 xstat_mtime_dir(&st
);
184 if (match_stat_data(&base
, &st
)) {
186 fprintf_ln(stderr
, _("directory stat info changes after "
187 "adding a file inside subdirectory"));
194 xstat_mtime_dir(&st
);
195 if (!match_stat_data(&base
, &st
)) {
197 fprintf_ln(stderr
, _("directory stat info does not "
198 "change after deleting a file"));
201 fill_stat_data(&base
, &st
);
205 xunlink("new-dir/new");
207 xstat_mtime_dir(&st
);
208 if (!match_stat_data(&base
, &st
)) {
210 fprintf_ln(stderr
, _("directory stat info does not "
211 "change after deleting a directory"));
215 if (rmdir(mtime_dir
.buf
))
216 die_errno(_("failed to delete directory %s"), mtime_dir
.buf
);
217 fprintf_ln(stderr
, _(" OK"));
221 strbuf_release(&mtime_dir
);
225 static int mark_ce_flags(const char *path
, int flag
, int mark
)
227 int namelen
= strlen(path
);
228 int pos
= cache_name_pos(path
, namelen
);
231 active_cache
[pos
]->ce_flags
|= flag
;
233 active_cache
[pos
]->ce_flags
&= ~flag
;
234 active_cache
[pos
]->ce_flags
|= CE_UPDATE_IN_BASE
;
235 cache_tree_invalidate_path(&the_index
, path
);
236 active_cache_changed
|= CE_ENTRY_CHANGED
;
242 static int remove_one_path(const char *path
)
245 return error("%s: does not exist and --remove not passed", path
);
246 if (remove_file_from_cache(path
))
247 return error("%s: cannot remove from the index", path
);
252 * Handle a path that couldn't be lstat'ed. It's either:
253 * - missing file (ENOENT or ENOTDIR). That's ok if we're
254 * supposed to be removing it and the removal actually
256 * - permission error. That's never ok.
258 static int process_lstat_error(const char *path
, int err
)
260 if (err
== ENOENT
|| err
== ENOTDIR
)
261 return remove_one_path(path
);
262 return error("lstat(\"%s\"): %s", path
, strerror(err
));
265 static int add_one_path(const struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
268 struct cache_entry
*ce
;
270 /* Was the old index entry already up-to-date? */
271 if (old
&& !ce_stage(old
) && !ce_match_stat(old
, st
, 0))
274 size
= cache_entry_size(len
);
275 ce
= xcalloc(1, size
);
276 memcpy(ce
->name
, path
, len
);
277 ce
->ce_flags
= create_ce_flags(0);
278 ce
->ce_namelen
= len
;
279 fill_stat_cache_info(ce
, st
);
280 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
282 if (index_path(ce
->oid
.hash
, path
, st
,
283 info_only
? 0 : HASH_WRITE_OBJECT
)) {
287 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
288 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
289 if (add_cache_entry(ce
, option
))
290 return error("%s: cannot add to the index - missing --add option?", path
);
295 * Handle a path that was a directory. Four cases:
297 * - it's already a gitlink in the index, and we keep it that
298 * way, and update it if we can (if we cannot find the HEAD,
299 * we're going to keep it unchanged in the index!)
301 * - it's a *file* in the index, in which case it should be
302 * removed as a file if removal is allowed, since it doesn't
303 * exist as such any more. If removal isn't allowed, it's
306 * (NOTE! This is old and arguably fairly strange behaviour.
307 * We might want to make this an error unconditionally, and
308 * use "--force-remove" if you actually want to force removal).
310 * - it used to exist as a subdirectory (ie multiple files with
311 * this particular prefix) in the index, in which case it's wrong
312 * to try to update it as a directory.
314 * - it doesn't exist at all in the index, but it is a valid
315 * git directory, and it should be *added* as a gitlink.
317 static int process_directory(const char *path
, int len
, struct stat
*st
)
319 struct object_id oid
;
320 int pos
= cache_name_pos(path
, len
);
322 /* Exact match: file or existing gitlink */
324 const struct cache_entry
*ce
= active_cache
[pos
];
325 if (S_ISGITLINK(ce
->ce_mode
)) {
327 /* Do nothing to the index if there is no HEAD! */
328 if (resolve_gitlink_ref(path
, "HEAD", oid
.hash
) < 0)
331 return add_one_path(ce
, path
, len
, st
);
333 /* Should this be an unconditional error? */
334 return remove_one_path(path
);
337 /* Inexact match: is there perhaps a subdirectory match? */
339 while (pos
< active_nr
) {
340 const struct cache_entry
*ce
= active_cache
[pos
++];
342 if (strncmp(ce
->name
, path
, len
))
344 if (ce
->name
[len
] > '/')
346 if (ce
->name
[len
] < '/')
349 /* Subdirectory match - error out */
350 return error("%s: is a directory - add individual files instead", path
);
353 /* No match - should we add it as a gitlink? */
354 if (!resolve_gitlink_ref(path
, "HEAD", oid
.hash
))
355 return add_one_path(NULL
, path
, len
, st
);
358 return error("%s: is a directory - add files inside instead", path
);
361 static int process_path(const char *path
)
365 const struct cache_entry
*ce
;
368 if (has_symlink_leading_path(path
, len
))
369 return error("'%s' is beyond a symbolic link", path
);
371 pos
= cache_name_pos(path
, len
);
372 ce
= pos
< 0 ? NULL
: active_cache
[pos
];
373 if (ce
&& ce_skip_worktree(ce
)) {
375 * working directory version is assumed "good"
376 * so updating it does not make sense.
377 * On the other hand, removing it from index should work
379 if (allow_remove
&& remove_file_from_cache(path
))
380 return error("%s: cannot remove from the index", path
);
385 * First things first: get the stat information, to decide
386 * what to do about the pathname!
388 if (lstat(path
, &st
) < 0)
389 return process_lstat_error(path
, errno
);
391 if (S_ISDIR(st
.st_mode
))
392 return process_directory(path
, len
, &st
);
394 return add_one_path(ce
, path
, len
, &st
);
397 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
398 const char *path
, int stage
)
400 int size
, len
, option
;
401 struct cache_entry
*ce
;
403 if (!verify_path(path
))
404 return error("Invalid path '%s'", path
);
407 size
= cache_entry_size(len
);
408 ce
= xcalloc(1, size
);
410 oidcpy(&ce
->oid
, oid
);
411 memcpy(ce
->name
, path
, len
);
412 ce
->ce_flags
= create_ce_flags(stage
);
413 ce
->ce_namelen
= len
;
414 ce
->ce_mode
= create_ce_mode(mode
);
415 if (assume_unchanged
)
416 ce
->ce_flags
|= CE_VALID
;
417 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
418 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
419 if (add_cache_entry(ce
, option
))
420 return error("%s: cannot add to the index - missing --add option?",
422 report("add '%s'", path
);
426 static void chmod_path(char flip
, const char *path
)
429 struct cache_entry
*ce
;
431 pos
= cache_name_pos(path
, strlen(path
));
434 ce
= active_cache
[pos
];
435 if (chmod_cache_entry(ce
, flip
) < 0)
438 report("chmod %cx '%s'", flip
, path
);
441 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
444 static void update_one(const char *path
)
446 if (!verify_path(path
)) {
447 fprintf(stderr
, "Ignoring path %s\n", path
);
450 if (mark_valid_only
) {
451 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
452 die("Unable to mark file %s", path
);
455 if (mark_skip_worktree_only
) {
456 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
457 die("Unable to mark file %s", path
);
462 if (remove_file_from_cache(path
))
463 die("git update-index: unable to remove %s", path
);
464 report("remove '%s'", path
);
467 if (process_path(path
))
468 die("Unable to process path %s", path
);
469 report("add '%s'", path
);
472 static void read_index_info(int nul_term_line
)
474 struct strbuf buf
= STRBUF_INIT
;
475 struct strbuf uq
= STRBUF_INIT
;
476 strbuf_getline_fn getline_fn
;
478 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
479 while (getline_fn(&buf
, stdin
) != EOF
) {
482 struct object_id oid
;
487 /* This reads lines formatted in one of three formats:
489 * (1) mode SP sha1 TAB path
490 * The first format is what "git apply --index-info"
491 * reports, and used to reconstruct a partial tree
492 * that is used for phony merge base tree when falling
493 * back on 3-way merge.
495 * (2) mode SP type SP sha1 TAB path
496 * The second format is to stuff "git ls-tree" output
497 * into the index file.
499 * (3) mode SP sha1 SP stage TAB path
500 * This format is to put higher order stages into the
501 * index file and matches "git ls-files --stage" output.
504 ul
= strtoul(buf
.buf
, &ptr
, 8);
505 if (ptr
== buf
.buf
|| *ptr
!= ' '
506 || errno
|| (unsigned int) ul
!= ul
)
510 tab
= strchr(ptr
, '\t');
511 if (!tab
|| tab
- ptr
< GIT_SHA1_HEXSZ
+ 1)
514 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
515 stage
= tab
[-1] - '0';
516 ptr
= tab
+ 1; /* point at the head of path */
517 tab
= tab
- 2; /* point at tail of sha1 */
521 ptr
= tab
+ 1; /* point at the head of path */
524 if (get_oid_hex(tab
- GIT_SHA1_HEXSZ
, &oid
) ||
525 tab
[-(GIT_SHA1_HEXSZ
+ 1)] != ' ')
529 if (!nul_term_line
&& path_name
[0] == '"') {
531 if (unquote_c_style(&uq
, path_name
, NULL
)) {
532 die("git update-index: bad quoting of path name");
537 if (!verify_path(path_name
)) {
538 fprintf(stderr
, "Ignoring path %s\n", path_name
);
543 /* mode == 0 means there is no such path -- remove */
544 if (remove_file_from_cache(path_name
))
545 die("git update-index: unable to remove %s",
549 /* mode ' ' sha1 '\t' name
550 * ptr[-1] points at tab,
551 * ptr[-41] is at the beginning of sha1
553 ptr
[-(GIT_SHA1_HEXSZ
+ 2)] = ptr
[-1] = 0;
554 if (add_cacheinfo(mode
, &oid
, path_name
, stage
))
555 die("git update-index: unable to update %s",
561 die("malformed index info %s", buf
.buf
);
563 strbuf_release(&buf
);
567 static const char * const update_index_usage
[] = {
568 N_("git update-index [<options>] [--] [<file>...]"),
572 static struct object_id head_oid
;
573 static struct object_id merge_head_oid
;
575 static struct cache_entry
*read_one_ent(const char *which
,
576 struct object_id
*ent
, const char *path
,
577 int namelen
, int stage
)
580 struct object_id oid
;
582 struct cache_entry
*ce
;
584 if (get_tree_entry(ent
->hash
, path
, oid
.hash
, &mode
)) {
586 error("%s: not in %s branch.", path
, which
);
589 if (mode
== S_IFDIR
) {
591 error("%s: not a blob in %s branch.", path
, which
);
594 size
= cache_entry_size(namelen
);
595 ce
= xcalloc(1, size
);
597 oidcpy(&ce
->oid
, &oid
);
598 memcpy(ce
->name
, path
, namelen
);
599 ce
->ce_flags
= create_ce_flags(stage
);
600 ce
->ce_namelen
= namelen
;
601 ce
->ce_mode
= create_ce_mode(mode
);
605 static int unresolve_one(const char *path
)
607 int namelen
= strlen(path
);
610 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
612 /* See if there is such entry in the index. */
613 pos
= cache_name_pos(path
, namelen
);
616 pos
= unmerge_cache_entry_at(pos
);
617 if (pos
< active_nr
) {
618 const struct cache_entry
*ce
= active_cache
[pos
];
620 ce_namelen(ce
) == namelen
&&
621 !memcmp(ce
->name
, path
, namelen
))
624 /* no resolve-undo information; fall back */
626 /* If there isn't, either it is unmerged, or
627 * resolved as "removed" by mistake. We do not
628 * want to do anything in the former case.
631 if (pos
< active_nr
) {
632 const struct cache_entry
*ce
= active_cache
[pos
];
633 if (ce_namelen(ce
) == namelen
&&
634 !memcmp(ce
->name
, path
, namelen
)) {
636 "%s: skipping still unmerged path.\n",
643 /* Grab blobs from given path from HEAD and MERGE_HEAD,
644 * stuff HEAD version in stage #2,
645 * stuff MERGE_HEAD version in stage #3.
647 ce_2
= read_one_ent("our", &head_oid
, path
, namelen
, 2);
648 ce_3
= read_one_ent("their", &merge_head_oid
, path
, namelen
, 3);
650 if (!ce_2
|| !ce_3
) {
654 if (!oidcmp(&ce_2
->oid
, &ce_3
->oid
) &&
655 ce_2
->ce_mode
== ce_3
->ce_mode
) {
656 fprintf(stderr
, "%s: identical in both, skipping.\n",
661 remove_file_from_cache(path
);
662 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
663 error("%s: cannot add our version to the index.", path
);
667 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
669 error("%s: cannot add their version to the index.", path
);
677 static void read_head_pointers(void)
679 if (read_ref("HEAD", head_oid
.hash
))
680 die("No HEAD -- no initial commit yet?");
681 if (read_ref("MERGE_HEAD", merge_head_oid
.hash
)) {
682 fprintf(stderr
, "Not in the middle of a merge.\n");
687 static int do_unresolve(int ac
, const char **av
,
688 const char *prefix
, int prefix_length
)
693 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
694 * are not doing a merge, so exit with success status.
696 read_head_pointers();
698 for (i
= 1; i
< ac
; i
++) {
699 const char *arg
= av
[i
];
700 char *p
= prefix_path(prefix
, prefix_length
, arg
);
701 err
|= unresolve_one(p
);
707 static int do_reupdate(int ac
, const char **av
,
708 const char *prefix
, int prefix_length
)
710 /* Read HEAD and run update-index on paths that are
711 * merged and already different between index and HEAD.
715 struct pathspec pathspec
;
717 parse_pathspec(&pathspec
, 0,
721 if (read_ref("HEAD", head_oid
.hash
))
722 /* If there is no HEAD, that means it is an initial
723 * commit. Update everything in the index.
727 for (pos
= 0; pos
< active_nr
; pos
++) {
728 const struct cache_entry
*ce
= active_cache
[pos
];
729 struct cache_entry
*old
= NULL
;
733 if (ce_stage(ce
) || !ce_path_match(ce
, &pathspec
, NULL
))
736 old
= read_one_ent(NULL
, &head_oid
,
737 ce
->name
, ce_namelen(ce
), 0);
738 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
739 !oidcmp(&ce
->oid
, &old
->oid
)) {
741 continue; /* unchanged */
743 /* Be careful. The working tree may not have the
744 * path anymore, in which case, under 'allow_remove',
745 * or worse yet 'allow_replace', active_nr may decrease.
748 path
= xstrdup(ce
->name
);
752 if (save_nr
!= active_nr
)
755 clear_pathspec(&pathspec
);
759 struct refresh_params
{
764 static int refresh(struct refresh_params
*o
, unsigned int flag
)
767 read_cache_preload(NULL
);
768 *o
->has_errors
|= refresh_cache(o
->flags
| flag
);
772 static int refresh_callback(const struct option
*opt
,
773 const char *arg
, int unset
)
775 return refresh(opt
->value
, 0);
778 static int really_refresh_callback(const struct option
*opt
,
779 const char *arg
, int unset
)
781 return refresh(opt
->value
, REFRESH_REALLY
);
784 static int chmod_callback(const struct option
*opt
,
785 const char *arg
, int unset
)
787 char *flip
= opt
->value
;
788 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
789 return error("option 'chmod' expects \"+x\" or \"-x\"");
794 static int resolve_undo_clear_callback(const struct option
*opt
,
795 const char *arg
, int unset
)
797 resolve_undo_clear();
801 static int parse_new_style_cacheinfo(const char *arg
,
803 struct object_id
*oid
,
813 ul
= strtoul(arg
, &endp
, 8);
814 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
815 return -1; /* not a new-style cacheinfo */
818 if (get_oid_hex(endp
, oid
) || endp
[GIT_SHA1_HEXSZ
] != ',')
820 *path
= endp
+ GIT_SHA1_HEXSZ
+ 1;
824 static int cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
825 const struct option
*opt
, int unset
)
827 struct object_id oid
;
831 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, &oid
, &path
)) {
832 if (add_cacheinfo(mode
, &oid
, path
, 0))
833 die("git update-index: --cacheinfo cannot add %s", path
);
839 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
840 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
841 get_oid_hex(*++ctx
->argv
, &oid
) ||
842 add_cacheinfo(mode
, &oid
, *++ctx
->argv
, 0))
843 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
848 static int stdin_cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
849 const struct option
*opt
, int unset
)
851 int *nul_term_line
= opt
->value
;
854 return error("option '%s' must be the last argument", opt
->long_name
);
855 allow_add
= allow_replace
= allow_remove
= 1;
856 read_index_info(*nul_term_line
);
860 static int stdin_callback(struct parse_opt_ctx_t
*ctx
,
861 const struct option
*opt
, int unset
)
863 int *read_from_stdin
= opt
->value
;
866 return error("option '%s' must be the last argument", opt
->long_name
);
867 *read_from_stdin
= 1;
871 static int unresolve_callback(struct parse_opt_ctx_t
*ctx
,
872 const struct option
*opt
, int flags
)
874 int *has_errors
= opt
->value
;
875 const char *prefix
= startup_info
->prefix
;
877 /* consume remaining arguments. */
878 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
879 prefix
, prefix
? strlen(prefix
) : 0);
881 active_cache_changed
= 0;
883 ctx
->argv
+= ctx
->argc
- 1;
888 static int reupdate_callback(struct parse_opt_ctx_t
*ctx
,
889 const struct option
*opt
, int flags
)
891 int *has_errors
= opt
->value
;
892 const char *prefix
= startup_info
->prefix
;
894 /* consume remaining arguments. */
896 *has_errors
= do_reupdate(ctx
->argc
, ctx
->argv
,
897 prefix
, prefix
? strlen(prefix
) : 0);
899 active_cache_changed
= 0;
901 ctx
->argv
+= ctx
->argc
- 1;
906 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
908 int newfd
, entries
, has_errors
= 0, nul_term_line
= 0;
909 enum uc_mode untracked_cache
= UC_UNSPECIFIED
;
910 int read_from_stdin
= 0;
911 int prefix_length
= prefix
? strlen(prefix
) : 0;
912 int preferred_index_format
= 0;
913 char set_executable_bit
= 0;
914 struct refresh_params refresh_args
= {0, &has_errors
};
916 int split_index
= -1;
917 struct lock_file
*lock_file
;
918 struct parse_opt_ctx_t ctx
;
919 strbuf_getline_fn getline_fn
;
920 int parseopt_state
= PARSE_OPT_UNKNOWN
;
921 struct option options
[] = {
922 OPT_BIT('q', NULL
, &refresh_args
.flags
,
923 N_("continue refresh even when index needs update"),
925 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
926 N_("refresh: ignore submodules"),
927 REFRESH_IGNORE_SUBMODULES
),
928 OPT_SET_INT(0, "add", &allow_add
,
929 N_("do not ignore new files"), 1),
930 OPT_SET_INT(0, "replace", &allow_replace
,
931 N_("let files replace directories and vice-versa"), 1),
932 OPT_SET_INT(0, "remove", &allow_remove
,
933 N_("notice files missing from worktree"), 1),
934 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
935 N_("refresh even if index contains unmerged entries"),
937 {OPTION_CALLBACK
, 0, "refresh", &refresh_args
, NULL
,
938 N_("refresh stat information"),
939 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
941 {OPTION_CALLBACK
, 0, "really-refresh", &refresh_args
, NULL
,
942 N_("like --refresh, but ignore assume-unchanged setting"),
943 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
944 really_refresh_callback
},
945 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
946 N_("<mode>,<object>,<path>"),
947 N_("add the specified entry to the index"),
948 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
949 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
950 (parse_opt_cb
*) cacheinfo_callback
},
951 {OPTION_CALLBACK
, 0, "chmod", &set_executable_bit
, N_("(+/-)x"),
952 N_("override the executable bit of the listed files"),
953 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
955 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
956 N_("mark files as \"not changing\""),
957 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
958 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
959 N_("clear assumed-unchanged bit"),
960 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
961 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
962 N_("mark files as \"index-only\""),
963 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
964 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
965 N_("clear skip-worktree bit"),
966 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
967 OPT_SET_INT(0, "info-only", &info_only
,
968 N_("add to index only; do not add content to object database"), 1),
969 OPT_SET_INT(0, "force-remove", &force_remove
,
970 N_("remove named paths even if present in worktree"), 1),
971 OPT_BOOL('z', NULL
, &nul_term_line
,
972 N_("with --stdin: input lines are terminated by null bytes")),
973 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
974 N_("read list of paths to be updated from standard input"),
975 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
976 (parse_opt_cb
*) stdin_callback
},
977 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &nul_term_line
, NULL
,
978 N_("add entries from standard input to the index"),
979 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
980 (parse_opt_cb
*) stdin_cacheinfo_callback
},
981 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
982 N_("repopulate stages #2 and #3 for the listed paths"),
983 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
984 (parse_opt_cb
*) unresolve_callback
},
985 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
986 N_("only update entries that differ from HEAD"),
987 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
988 (parse_opt_cb
*) reupdate_callback
},
989 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
990 N_("ignore files missing from worktree"),
991 REFRESH_IGNORE_MISSING
),
992 OPT_SET_INT(0, "verbose", &verbose
,
993 N_("report actions to standard output"), 1),
994 {OPTION_CALLBACK
, 0, "clear-resolve-undo", NULL
, NULL
,
995 N_("(for porcelains) forget saved unresolved conflicts"),
996 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
997 resolve_undo_clear_callback
},
998 OPT_INTEGER(0, "index-version", &preferred_index_format
,
999 N_("write index in this format")),
1000 OPT_BOOL(0, "split-index", &split_index
,
1001 N_("enable or disable split index")),
1002 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1003 N_("enable/disable untracked cache")),
1004 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache
,
1005 N_("test if the filesystem supports untracked cache"), UC_TEST
),
1006 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1007 N_("enable untracked cache without testing the filesystem"), UC_FORCE
),
1011 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1012 usage_with_options(update_index_usage
, options
);
1014 git_config(git_default_config
, NULL
);
1016 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
1017 lock_file
= xcalloc(1, sizeof(struct lock_file
));
1019 /* we will diagnose later if it turns out that we need to update it */
1020 newfd
= hold_locked_index(lock_file
, 0);
1024 entries
= read_cache();
1026 die("cache corrupted");
1029 * Custom copy of parse_options() because we want to handle
1030 * filename arguments as they come.
1032 parse_options_start(&ctx
, argc
, argv
, prefix
,
1033 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
1035 if (parseopt_state
!= PARSE_OPT_DONE
)
1036 parseopt_state
= parse_options_step(&ctx
, options
,
1037 update_index_usage
);
1040 switch (parseopt_state
) {
1041 case PARSE_OPT_HELP
:
1043 case PARSE_OPT_NON_OPTION
:
1044 case PARSE_OPT_DONE
:
1046 const char *path
= ctx
.argv
[0];
1050 p
= prefix_path(prefix
, prefix_length
, path
);
1052 if (set_executable_bit
)
1053 chmod_path(set_executable_bit
, p
);
1059 case PARSE_OPT_UNKNOWN
:
1060 if (ctx
.argv
[0][1] == '-')
1061 error("unknown option '%s'", ctx
.argv
[0] + 2);
1063 error("unknown switch '%c'", *ctx
.opt
);
1064 usage_with_options(update_index_usage
, options
);
1067 argc
= parse_options_end(&ctx
);
1069 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
1070 if (preferred_index_format
) {
1071 if (preferred_index_format
< INDEX_FORMAT_LB
||
1072 INDEX_FORMAT_UB
< preferred_index_format
)
1073 die("index-version %d not in range: %d..%d",
1074 preferred_index_format
,
1075 INDEX_FORMAT_LB
, INDEX_FORMAT_UB
);
1077 if (the_index
.version
!= preferred_index_format
)
1078 active_cache_changed
|= SOMETHING_CHANGED
;
1079 the_index
.version
= preferred_index_format
;
1082 if (read_from_stdin
) {
1083 struct strbuf buf
= STRBUF_INIT
;
1084 struct strbuf unquoted
= STRBUF_INIT
;
1087 while (getline_fn(&buf
, stdin
) != EOF
) {
1089 if (!nul_term_line
&& buf
.buf
[0] == '"') {
1090 strbuf_reset(&unquoted
);
1091 if (unquote_c_style(&unquoted
, buf
.buf
, NULL
))
1092 die("line is badly quoted");
1093 strbuf_swap(&buf
, &unquoted
);
1095 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
1097 if (set_executable_bit
)
1098 chmod_path(set_executable_bit
, p
);
1101 strbuf_release(&unquoted
);
1102 strbuf_release(&buf
);
1105 if (split_index
> 0) {
1106 if (git_config_get_split_index() == 0)
1107 warning(_("core.splitIndex is set to false; "
1108 "remove or change it, if you really want to "
1109 "enable split index"));
1110 if (the_index
.split_index
)
1111 the_index
.cache_changed
|= SPLIT_INDEX_ORDERED
;
1113 add_split_index(&the_index
);
1114 } else if (!split_index
) {
1115 if (git_config_get_split_index() == 1)
1116 warning(_("core.splitIndex is set to true; "
1117 "remove or change it, if you really want to "
1118 "disable split index"));
1119 remove_split_index(&the_index
);
1122 switch (untracked_cache
) {
1123 case UC_UNSPECIFIED
:
1126 if (git_config_get_untracked_cache() == 1)
1127 warning(_("core.untrackedCache is set to true; "
1128 "remove or change it, if you really want to "
1129 "disable the untracked cache"));
1130 remove_untracked_cache(&the_index
);
1131 report(_("Untracked cache disabled"));
1135 return !test_if_untracked_cache_is_supported();
1138 if (git_config_get_untracked_cache() == 0)
1139 warning(_("core.untrackedCache is set to false; "
1140 "remove or change it, if you really want to "
1141 "enable the untracked cache"));
1142 add_untracked_cache(&the_index
);
1143 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1146 die("BUG: bad untracked_cache value: %d", untracked_cache
);
1149 if (active_cache_changed
) {
1151 if (refresh_args
.flags
& REFRESH_QUIET
)
1153 unable_to_lock_die(get_index_file(), lock_error
);
1155 if (write_locked_index(&the_index
, lock_file
, COMMIT_LOCK
))
1156 die("Unable to write new index file");
1159 rollback_lock_file(lock_file
);
1161 return has_errors
? 1 : 0;