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
;
129 strbuf_addstr(&mtime_dir
, "mtime-test-XXXXXX");
130 if (!mkdtemp(mtime_dir
.buf
))
131 die_errno("Could not make temporary directory");
133 fprintf(stderr
, _("Testing mtime in '%s' "), xgetcwd());
134 atexit(remove_test_directory
);
135 xstat_mtime_dir(&st
);
136 fill_stat_data(&base
, &st
);
140 fd
= create_file("newfile");
141 xstat_mtime_dir(&st
);
142 if (!match_stat_data(&base
, &st
)) {
145 fprintf_ln(stderr
,_("directory stat info does not "
146 "change after adding a new file"));
149 fill_stat_data(&base
, &st
);
154 xstat_mtime_dir(&st
);
155 if (!match_stat_data(&base
, &st
)) {
158 fprintf_ln(stderr
, _("directory stat info does not change "
159 "after adding a new directory"));
162 fill_stat_data(&base
, &st
);
166 write_or_die(fd
, "data", 4);
168 xstat_mtime_dir(&st
);
169 if (match_stat_data(&base
, &st
)) {
171 fprintf_ln(stderr
, _("directory stat info changes "
172 "after updating a file"));
178 close(create_file("new-dir/new"));
179 xstat_mtime_dir(&st
);
180 if (match_stat_data(&base
, &st
)) {
182 fprintf_ln(stderr
, _("directory stat info changes after "
183 "adding a file inside subdirectory"));
190 xstat_mtime_dir(&st
);
191 if (!match_stat_data(&base
, &st
)) {
193 fprintf_ln(stderr
, _("directory stat info does not "
194 "change after deleting a file"));
197 fill_stat_data(&base
, &st
);
201 xunlink("new-dir/new");
203 xstat_mtime_dir(&st
);
204 if (!match_stat_data(&base
, &st
)) {
206 fprintf_ln(stderr
, _("directory stat info does not "
207 "change after deleting a directory"));
211 if (rmdir(mtime_dir
.buf
))
212 die_errno(_("failed to delete directory %s"), mtime_dir
.buf
);
213 fprintf_ln(stderr
, _(" OK"));
217 strbuf_release(&mtime_dir
);
221 static int mark_ce_flags(const char *path
, int flag
, int mark
)
223 int namelen
= strlen(path
);
224 int pos
= cache_name_pos(path
, namelen
);
227 active_cache
[pos
]->ce_flags
|= flag
;
229 active_cache
[pos
]->ce_flags
&= ~flag
;
230 active_cache
[pos
]->ce_flags
|= CE_UPDATE_IN_BASE
;
231 cache_tree_invalidate_path(&the_index
, path
);
232 active_cache_changed
|= CE_ENTRY_CHANGED
;
238 static int remove_one_path(const char *path
)
241 return error("%s: does not exist and --remove not passed", path
);
242 if (remove_file_from_cache(path
))
243 return error("%s: cannot remove from the index", path
);
248 * Handle a path that couldn't be lstat'ed. It's either:
249 * - missing file (ENOENT or ENOTDIR). That's ok if we're
250 * supposed to be removing it and the removal actually
252 * - permission error. That's never ok.
254 static int process_lstat_error(const char *path
, int err
)
256 if (err
== ENOENT
|| err
== ENOTDIR
)
257 return remove_one_path(path
);
258 return error("lstat(\"%s\"): %s", path
, strerror(errno
));
261 static int add_one_path(const struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
264 struct cache_entry
*ce
;
266 /* Was the old index entry already up-to-date? */
267 if (old
&& !ce_stage(old
) && !ce_match_stat(old
, st
, 0))
270 size
= cache_entry_size(len
);
271 ce
= xcalloc(1, size
);
272 memcpy(ce
->name
, path
, len
);
273 ce
->ce_flags
= create_ce_flags(0);
274 ce
->ce_namelen
= len
;
275 fill_stat_cache_info(ce
, st
);
276 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
278 if (index_path(ce
->sha1
, path
, st
,
279 info_only
? 0 : HASH_WRITE_OBJECT
)) {
283 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
284 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
285 if (add_cache_entry(ce
, option
))
286 return error("%s: cannot add to the index - missing --add option?", path
);
291 * Handle a path that was a directory. Four cases:
293 * - it's already a gitlink in the index, and we keep it that
294 * way, and update it if we can (if we cannot find the HEAD,
295 * we're going to keep it unchanged in the index!)
297 * - it's a *file* in the index, in which case it should be
298 * removed as a file if removal is allowed, since it doesn't
299 * exist as such any more. If removal isn't allowed, it's
302 * (NOTE! This is old and arguably fairly strange behaviour.
303 * We might want to make this an error unconditionally, and
304 * use "--force-remove" if you actually want to force removal).
306 * - it used to exist as a subdirectory (ie multiple files with
307 * this particular prefix) in the index, in which case it's wrong
308 * to try to update it as a directory.
310 * - it doesn't exist at all in the index, but it is a valid
311 * git directory, and it should be *added* as a gitlink.
313 static int process_directory(const char *path
, int len
, struct stat
*st
)
315 unsigned char sha1
[20];
316 int pos
= cache_name_pos(path
, len
);
318 /* Exact match: file or existing gitlink */
320 const struct cache_entry
*ce
= active_cache
[pos
];
321 if (S_ISGITLINK(ce
->ce_mode
)) {
323 /* Do nothing to the index if there is no HEAD! */
324 if (resolve_gitlink_ref(path
, "HEAD", sha1
) < 0)
327 return add_one_path(ce
, path
, len
, st
);
329 /* Should this be an unconditional error? */
330 return remove_one_path(path
);
333 /* Inexact match: is there perhaps a subdirectory match? */
335 while (pos
< active_nr
) {
336 const struct cache_entry
*ce
= active_cache
[pos
++];
338 if (strncmp(ce
->name
, path
, len
))
340 if (ce
->name
[len
] > '/')
342 if (ce
->name
[len
] < '/')
345 /* Subdirectory match - error out */
346 return error("%s: is a directory - add individual files instead", path
);
349 /* No match - should we add it as a gitlink? */
350 if (!resolve_gitlink_ref(path
, "HEAD", sha1
))
351 return add_one_path(NULL
, path
, len
, st
);
354 return error("%s: is a directory - add files inside instead", path
);
357 static int process_path(const char *path
)
361 const struct cache_entry
*ce
;
364 if (has_symlink_leading_path(path
, len
))
365 return error("'%s' is beyond a symbolic link", path
);
367 pos
= cache_name_pos(path
, len
);
368 ce
= pos
< 0 ? NULL
: active_cache
[pos
];
369 if (ce
&& ce_skip_worktree(ce
)) {
371 * working directory version is assumed "good"
372 * so updating it does not make sense.
373 * On the other hand, removing it from index should work
375 if (allow_remove
&& remove_file_from_cache(path
))
376 return error("%s: cannot remove from the index", path
);
381 * First things first: get the stat information, to decide
382 * what to do about the pathname!
384 if (lstat(path
, &st
) < 0)
385 return process_lstat_error(path
, errno
);
387 if (S_ISDIR(st
.st_mode
))
388 return process_directory(path
, len
, &st
);
390 return add_one_path(ce
, path
, len
, &st
);
393 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
394 const char *path
, int stage
)
396 int size
, len
, option
;
397 struct cache_entry
*ce
;
399 if (!verify_path(path
))
400 return error("Invalid path '%s'", path
);
403 size
= cache_entry_size(len
);
404 ce
= xcalloc(1, size
);
406 hashcpy(ce
->sha1
, sha1
);
407 memcpy(ce
->name
, path
, len
);
408 ce
->ce_flags
= create_ce_flags(stage
);
409 ce
->ce_namelen
= len
;
410 ce
->ce_mode
= create_ce_mode(mode
);
411 if (assume_unchanged
)
412 ce
->ce_flags
|= CE_VALID
;
413 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
414 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
415 if (add_cache_entry(ce
, option
))
416 return error("%s: cannot add to the index - missing --add option?",
418 report("add '%s'", path
);
422 static void chmod_path(int flip
, const char *path
)
425 struct cache_entry
*ce
;
428 pos
= cache_name_pos(path
, strlen(path
));
431 ce
= active_cache
[pos
];
437 ce
->ce_mode
|= 0111; break;
439 ce
->ce_mode
&= ~0111; break;
443 cache_tree_invalidate_path(&the_index
, path
);
444 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
445 active_cache_changed
|= CE_ENTRY_CHANGED
;
446 report("chmod %cx '%s'", flip
, path
);
449 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
452 static void update_one(const char *path
)
454 if (!verify_path(path
)) {
455 fprintf(stderr
, "Ignoring path %s\n", path
);
458 if (mark_valid_only
) {
459 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
460 die("Unable to mark file %s", path
);
463 if (mark_skip_worktree_only
) {
464 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
465 die("Unable to mark file %s", path
);
470 if (remove_file_from_cache(path
))
471 die("git update-index: unable to remove %s", path
);
472 report("remove '%s'", path
);
475 if (process_path(path
))
476 die("Unable to process path %s", path
);
477 report("add '%s'", path
);
480 static void read_index_info(int line_termination
)
482 struct strbuf buf
= STRBUF_INIT
;
483 struct strbuf uq
= STRBUF_INIT
;
485 while (strbuf_getline(&buf
, stdin
, line_termination
) != EOF
) {
488 unsigned char sha1
[20];
493 /* This reads lines formatted in one of three formats:
495 * (1) mode SP sha1 TAB path
496 * The first format is what "git apply --index-info"
497 * reports, and used to reconstruct a partial tree
498 * that is used for phony merge base tree when falling
499 * back on 3-way merge.
501 * (2) mode SP type SP sha1 TAB path
502 * The second format is to stuff "git ls-tree" output
503 * into the index file.
505 * (3) mode SP sha1 SP stage TAB path
506 * This format is to put higher order stages into the
507 * index file and matches "git ls-files --stage" output.
510 ul
= strtoul(buf
.buf
, &ptr
, 8);
511 if (ptr
== buf
.buf
|| *ptr
!= ' '
512 || errno
|| (unsigned int) ul
!= ul
)
516 tab
= strchr(ptr
, '\t');
517 if (!tab
|| tab
- ptr
< 41)
520 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
521 stage
= tab
[-1] - '0';
522 ptr
= tab
+ 1; /* point at the head of path */
523 tab
= tab
- 2; /* point at tail of sha1 */
527 ptr
= tab
+ 1; /* point at the head of path */
530 if (get_sha1_hex(tab
- 40, sha1
) || tab
[-41] != ' ')
534 if (line_termination
&& path_name
[0] == '"') {
536 if (unquote_c_style(&uq
, path_name
, NULL
)) {
537 die("git update-index: bad quoting of path name");
542 if (!verify_path(path_name
)) {
543 fprintf(stderr
, "Ignoring path %s\n", path_name
);
548 /* mode == 0 means there is no such path -- remove */
549 if (remove_file_from_cache(path_name
))
550 die("git update-index: unable to remove %s",
554 /* mode ' ' sha1 '\t' name
555 * ptr[-1] points at tab,
556 * ptr[-41] is at the beginning of sha1
558 ptr
[-42] = ptr
[-1] = 0;
559 if (add_cacheinfo(mode
, sha1
, path_name
, stage
))
560 die("git update-index: unable to update %s",
566 die("malformed index info %s", buf
.buf
);
568 strbuf_release(&buf
);
572 static const char * const update_index_usage
[] = {
573 N_("git update-index [<options>] [--] [<file>...]"),
577 static unsigned char head_sha1
[20];
578 static unsigned char merge_head_sha1
[20];
580 static struct cache_entry
*read_one_ent(const char *which
,
581 unsigned char *ent
, const char *path
,
582 int namelen
, int stage
)
585 unsigned char sha1
[20];
587 struct cache_entry
*ce
;
589 if (get_tree_entry(ent
, path
, sha1
, &mode
)) {
591 error("%s: not in %s branch.", path
, which
);
594 if (mode
== S_IFDIR
) {
596 error("%s: not a blob in %s branch.", path
, which
);
599 size
= cache_entry_size(namelen
);
600 ce
= xcalloc(1, size
);
602 hashcpy(ce
->sha1
, sha1
);
603 memcpy(ce
->name
, path
, namelen
);
604 ce
->ce_flags
= create_ce_flags(stage
);
605 ce
->ce_namelen
= namelen
;
606 ce
->ce_mode
= create_ce_mode(mode
);
610 static int unresolve_one(const char *path
)
612 int namelen
= strlen(path
);
615 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
617 /* See if there is such entry in the index. */
618 pos
= cache_name_pos(path
, namelen
);
621 pos
= unmerge_cache_entry_at(pos
);
622 if (pos
< active_nr
) {
623 const struct cache_entry
*ce
= active_cache
[pos
];
625 ce_namelen(ce
) == namelen
&&
626 !memcmp(ce
->name
, path
, namelen
))
629 /* no resolve-undo information; fall back */
631 /* If there isn't, either it is unmerged, or
632 * resolved as "removed" by mistake. We do not
633 * want to do anything in the former case.
636 if (pos
< active_nr
) {
637 const struct cache_entry
*ce
= active_cache
[pos
];
638 if (ce_namelen(ce
) == namelen
&&
639 !memcmp(ce
->name
, path
, namelen
)) {
641 "%s: skipping still unmerged path.\n",
648 /* Grab blobs from given path from HEAD and MERGE_HEAD,
649 * stuff HEAD version in stage #2,
650 * stuff MERGE_HEAD version in stage #3.
652 ce_2
= read_one_ent("our", head_sha1
, path
, namelen
, 2);
653 ce_3
= read_one_ent("their", merge_head_sha1
, path
, namelen
, 3);
655 if (!ce_2
|| !ce_3
) {
659 if (!hashcmp(ce_2
->sha1
, ce_3
->sha1
) &&
660 ce_2
->ce_mode
== ce_3
->ce_mode
) {
661 fprintf(stderr
, "%s: identical in both, skipping.\n",
666 remove_file_from_cache(path
);
667 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
668 error("%s: cannot add our version to the index.", path
);
672 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
674 error("%s: cannot add their version to the index.", path
);
682 static void read_head_pointers(void)
684 if (read_ref("HEAD", head_sha1
))
685 die("No HEAD -- no initial commit yet?");
686 if (read_ref("MERGE_HEAD", merge_head_sha1
)) {
687 fprintf(stderr
, "Not in the middle of a merge.\n");
692 static int do_unresolve(int ac
, const char **av
,
693 const char *prefix
, int prefix_length
)
698 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
699 * are not doing a merge, so exit with success status.
701 read_head_pointers();
703 for (i
= 1; i
< ac
; i
++) {
704 const char *arg
= av
[i
];
705 char *p
= prefix_path(prefix
, prefix_length
, arg
);
706 err
|= unresolve_one(p
);
712 static int do_reupdate(int ac
, const char **av
,
713 const char *prefix
, int prefix_length
)
715 /* Read HEAD and run update-index on paths that are
716 * merged and already different between index and HEAD.
720 struct pathspec pathspec
;
722 parse_pathspec(&pathspec
, 0,
726 if (read_ref("HEAD", head_sha1
))
727 /* If there is no HEAD, that means it is an initial
728 * commit. Update everything in the index.
732 for (pos
= 0; pos
< active_nr
; pos
++) {
733 const struct cache_entry
*ce
= active_cache
[pos
];
734 struct cache_entry
*old
= NULL
;
738 if (ce_stage(ce
) || !ce_path_match(ce
, &pathspec
, NULL
))
741 old
= read_one_ent(NULL
, head_sha1
,
742 ce
->name
, ce_namelen(ce
), 0);
743 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
744 !hashcmp(ce
->sha1
, old
->sha1
)) {
746 continue; /* unchanged */
748 /* Be careful. The working tree may not have the
749 * path anymore, in which case, under 'allow_remove',
750 * or worse yet 'allow_replace', active_nr may decrease.
753 path
= xstrdup(ce
->name
);
757 if (save_nr
!= active_nr
)
760 free_pathspec(&pathspec
);
764 struct refresh_params
{
769 static int refresh(struct refresh_params
*o
, unsigned int flag
)
772 read_cache_preload(NULL
);
773 *o
->has_errors
|= refresh_cache(o
->flags
| flag
);
777 static int refresh_callback(const struct option
*opt
,
778 const char *arg
, int unset
)
780 return refresh(opt
->value
, 0);
783 static int really_refresh_callback(const struct option
*opt
,
784 const char *arg
, int unset
)
786 return refresh(opt
->value
, REFRESH_REALLY
);
789 static int chmod_callback(const struct option
*opt
,
790 const char *arg
, int unset
)
792 char *flip
= opt
->value
;
793 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
794 return error("option 'chmod' expects \"+x\" or \"-x\"");
799 static int resolve_undo_clear_callback(const struct option
*opt
,
800 const char *arg
, int unset
)
802 resolve_undo_clear();
806 static int parse_new_style_cacheinfo(const char *arg
,
808 unsigned char sha1
[],
818 ul
= strtoul(arg
, &endp
, 8);
819 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
820 return -1; /* not a new-style cacheinfo */
823 if (get_sha1_hex(endp
, sha1
) || endp
[40] != ',')
829 static int cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
830 const struct option
*opt
, int unset
)
832 unsigned char sha1
[20];
836 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, sha1
, &path
)) {
837 if (add_cacheinfo(mode
, sha1
, path
, 0))
838 die("git update-index: --cacheinfo cannot add %s", path
);
844 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
845 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
846 get_sha1_hex(*++ctx
->argv
, sha1
) ||
847 add_cacheinfo(mode
, sha1
, *++ctx
->argv
, 0))
848 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
853 static int stdin_cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
854 const struct option
*opt
, int unset
)
856 int *line_termination
= opt
->value
;
859 return error("option '%s' must be the last argument", opt
->long_name
);
860 allow_add
= allow_replace
= allow_remove
= 1;
861 read_index_info(*line_termination
);
865 static int stdin_callback(struct parse_opt_ctx_t
*ctx
,
866 const struct option
*opt
, int unset
)
868 int *read_from_stdin
= opt
->value
;
871 return error("option '%s' must be the last argument", opt
->long_name
);
872 *read_from_stdin
= 1;
876 static int unresolve_callback(struct parse_opt_ctx_t
*ctx
,
877 const struct option
*opt
, int flags
)
879 int *has_errors
= opt
->value
;
880 const char *prefix
= startup_info
->prefix
;
882 /* consume remaining arguments. */
883 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
884 prefix
, prefix
? strlen(prefix
) : 0);
886 active_cache_changed
= 0;
888 ctx
->argv
+= ctx
->argc
- 1;
893 static int reupdate_callback(struct parse_opt_ctx_t
*ctx
,
894 const struct option
*opt
, int flags
)
896 int *has_errors
= opt
->value
;
897 const char *prefix
= startup_info
->prefix
;
899 /* consume remaining arguments. */
901 *has_errors
= do_reupdate(ctx
->argc
, ctx
->argv
,
902 prefix
, prefix
? strlen(prefix
) : 0);
904 active_cache_changed
= 0;
906 ctx
->argv
+= ctx
->argc
- 1;
911 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
913 int newfd
, entries
, has_errors
= 0, line_termination
= '\n';
914 enum uc_mode untracked_cache
= UC_UNSPECIFIED
;
915 int read_from_stdin
= 0;
916 int prefix_length
= prefix
? strlen(prefix
) : 0;
917 int preferred_index_format
= 0;
918 char set_executable_bit
= 0;
919 struct refresh_params refresh_args
= {0, &has_errors
};
921 int split_index
= -1;
922 struct lock_file
*lock_file
;
923 struct parse_opt_ctx_t ctx
;
924 int parseopt_state
= PARSE_OPT_UNKNOWN
;
925 struct option options
[] = {
926 OPT_BIT('q', NULL
, &refresh_args
.flags
,
927 N_("continue refresh even when index needs update"),
929 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
930 N_("refresh: ignore submodules"),
931 REFRESH_IGNORE_SUBMODULES
),
932 OPT_SET_INT(0, "add", &allow_add
,
933 N_("do not ignore new files"), 1),
934 OPT_SET_INT(0, "replace", &allow_replace
,
935 N_("let files replace directories and vice-versa"), 1),
936 OPT_SET_INT(0, "remove", &allow_remove
,
937 N_("notice files missing from worktree"), 1),
938 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
939 N_("refresh even if index contains unmerged entries"),
941 {OPTION_CALLBACK
, 0, "refresh", &refresh_args
, NULL
,
942 N_("refresh stat information"),
943 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
945 {OPTION_CALLBACK
, 0, "really-refresh", &refresh_args
, NULL
,
946 N_("like --refresh, but ignore assume-unchanged setting"),
947 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
948 really_refresh_callback
},
949 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
950 N_("<mode>,<object>,<path>"),
951 N_("add the specified entry to the index"),
952 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
953 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
954 (parse_opt_cb
*) cacheinfo_callback
},
955 {OPTION_CALLBACK
, 0, "chmod", &set_executable_bit
, N_("(+/-)x"),
956 N_("override the executable bit of the listed files"),
957 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
959 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
960 N_("mark files as \"not changing\""),
961 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
962 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
963 N_("clear assumed-unchanged bit"),
964 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
965 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
966 N_("mark files as \"index-only\""),
967 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
968 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
969 N_("clear skip-worktree bit"),
970 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
971 OPT_SET_INT(0, "info-only", &info_only
,
972 N_("add to index only; do not add content to object database"), 1),
973 OPT_SET_INT(0, "force-remove", &force_remove
,
974 N_("remove named paths even if present in worktree"), 1),
975 OPT_SET_INT('z', NULL
, &line_termination
,
976 N_("with --stdin: input lines are terminated by null bytes"), '\0'),
977 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
978 N_("read list of paths to be updated from standard input"),
979 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
980 (parse_opt_cb
*) stdin_callback
},
981 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &line_termination
, NULL
,
982 N_("add entries from standard input to the index"),
983 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
984 (parse_opt_cb
*) stdin_cacheinfo_callback
},
985 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
986 N_("repopulate stages #2 and #3 for the listed paths"),
987 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
988 (parse_opt_cb
*) unresolve_callback
},
989 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
990 N_("only update entries that differ from HEAD"),
991 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
992 (parse_opt_cb
*) reupdate_callback
},
993 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
994 N_("ignore files missing from worktree"),
995 REFRESH_IGNORE_MISSING
),
996 OPT_SET_INT(0, "verbose", &verbose
,
997 N_("report actions to standard output"), 1),
998 {OPTION_CALLBACK
, 0, "clear-resolve-undo", NULL
, NULL
,
999 N_("(for porcelains) forget saved unresolved conflicts"),
1000 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1001 resolve_undo_clear_callback
},
1002 OPT_INTEGER(0, "index-version", &preferred_index_format
,
1003 N_("write index in this format")),
1004 OPT_BOOL(0, "split-index", &split_index
,
1005 N_("enable or disable split index")),
1006 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1007 N_("enable/disable untracked cache")),
1008 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache
,
1009 N_("test if the filesystem supports untracked cache"), UC_TEST
),
1010 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1011 N_("enable untracked cache without testing the filesystem"), UC_FORCE
),
1015 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1016 usage_with_options(update_index_usage
, options
);
1018 git_config(git_default_config
, NULL
);
1020 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
1021 lock_file
= xcalloc(1, sizeof(struct lock_file
));
1023 newfd
= hold_locked_index(lock_file
, 0);
1027 entries
= read_cache();
1029 die("cache corrupted");
1032 * Custom copy of parse_options() because we want to handle
1033 * filename arguments as they come.
1035 parse_options_start(&ctx
, argc
, argv
, prefix
,
1036 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
1038 if (parseopt_state
!= PARSE_OPT_DONE
)
1039 parseopt_state
= parse_options_step(&ctx
, options
,
1040 update_index_usage
);
1043 switch (parseopt_state
) {
1044 case PARSE_OPT_HELP
:
1046 case PARSE_OPT_NON_OPTION
:
1047 case PARSE_OPT_DONE
:
1049 const char *path
= ctx
.argv
[0];
1053 p
= prefix_path(prefix
, prefix_length
, path
);
1055 if (set_executable_bit
)
1056 chmod_path(set_executable_bit
, p
);
1062 case PARSE_OPT_UNKNOWN
:
1063 if (ctx
.argv
[0][1] == '-')
1064 error("unknown option '%s'", ctx
.argv
[0] + 2);
1066 error("unknown switch '%c'", *ctx
.opt
);
1067 usage_with_options(update_index_usage
, options
);
1070 argc
= parse_options_end(&ctx
);
1071 if (preferred_index_format
) {
1072 if (preferred_index_format
< INDEX_FORMAT_LB
||
1073 INDEX_FORMAT_UB
< preferred_index_format
)
1074 die("index-version %d not in range: %d..%d",
1075 preferred_index_format
,
1076 INDEX_FORMAT_LB
, INDEX_FORMAT_UB
);
1078 if (the_index
.version
!= preferred_index_format
)
1079 active_cache_changed
|= SOMETHING_CHANGED
;
1080 the_index
.version
= preferred_index_format
;
1083 if (read_from_stdin
) {
1084 struct strbuf buf
= STRBUF_INIT
, nbuf
= STRBUF_INIT
;
1087 while (strbuf_getline(&buf
, stdin
, line_termination
) != EOF
) {
1089 if (line_termination
&& buf
.buf
[0] == '"') {
1090 strbuf_reset(&nbuf
);
1091 if (unquote_c_style(&nbuf
, buf
.buf
, NULL
))
1092 die("line is badly quoted");
1093 strbuf_swap(&buf
, &nbuf
);
1095 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
1097 if (set_executable_bit
)
1098 chmod_path(set_executable_bit
, p
);
1101 strbuf_release(&nbuf
);
1102 strbuf_release(&buf
);
1105 if (split_index
> 0) {
1106 init_split_index(&the_index
);
1107 the_index
.cache_changed
|= SPLIT_INDEX_ORDERED
;
1108 } else if (!split_index
&& the_index
.split_index
) {
1110 * can't discard_split_index(&the_index); because that
1111 * will destroy split_index->base->cache[], which may
1112 * be shared with the_index.cache[]. So yeah we're
1113 * leaking a bit here.
1115 the_index
.split_index
= NULL
;
1116 the_index
.cache_changed
|= SOMETHING_CHANGED
;
1119 switch (untracked_cache
) {
1120 case UC_UNSPECIFIED
:
1123 if (git_config_get_untracked_cache() == 1)
1124 warning("core.untrackedCache is set to true; "
1125 "remove or change it, if you really want to "
1126 "disable the untracked cache");
1127 remove_untracked_cache(&the_index
);
1128 report(_("Untracked cache disabled"));
1132 return !test_if_untracked_cache_is_supported();
1135 if (git_config_get_untracked_cache() == 0)
1136 warning("core.untrackedCache is set to false; "
1137 "remove or change it, if you really want to "
1138 "enable the untracked cache");
1139 add_untracked_cache(&the_index
);
1140 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1143 die("Bug: bad untracked_cache value: %d", untracked_cache
);
1146 if (active_cache_changed
) {
1148 if (refresh_args
.flags
& REFRESH_QUIET
)
1150 unable_to_lock_die(get_index_file(), lock_error
);
1152 if (write_locked_index(&the_index
, lock_file
, COMMIT_LOCK
))
1153 die("Unable to write new index file");
1156 rollback_lock_file(lock_file
);
1158 return has_errors
? 1 : 0;