2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
10 #include "cache-tree.h"
11 #include "tree-walk.h"
14 #include "resolve-undo.h"
15 #include "parse-options.h"
18 #include "split-index.h"
21 * Default to not allowing changes to the list of files. The
22 * tool doesn't actually care, but this makes it harder to add
23 * files to the revision control by mistake by doing something
24 * like "git update-index *" and suddenly having all the object
25 * files be revision controlled.
28 static int allow_remove
;
29 static int allow_replace
;
31 static int force_remove
;
33 static int mark_valid_only
;
34 static int mark_skip_worktree_only
;
37 static struct strbuf mtime_dir
= STRBUF_INIT
;
39 /* Untracked cache mode */
48 __attribute__((format (printf
, 1, 2)))
49 static void report(const char *fmt
, ...)
62 static void remove_test_directory(void)
65 remove_dir_recursively(&mtime_dir
, 0);
68 static const char *get_mtime_path(const char *path
)
70 static struct strbuf sb
= STRBUF_INIT
;
72 strbuf_addf(&sb
, "%s/%s", mtime_dir
.buf
, path
);
76 static void xmkdir(const char *path
)
78 path
= get_mtime_path(path
);
79 if (mkdir(path
, 0700))
80 die_errno(_("failed to create directory %s"), path
);
83 static int xstat_mtime_dir(struct stat
*st
)
85 if (stat(mtime_dir
.buf
, st
))
86 die_errno(_("failed to stat %s"), mtime_dir
.buf
);
90 static int create_file(const char *path
)
93 path
= get_mtime_path(path
);
94 fd
= open(path
, O_CREAT
| O_RDWR
, 0644);
96 die_errno(_("failed to create file %s"), path
);
100 static void xunlink(const char *path
)
102 path
= get_mtime_path(path
);
104 die_errno(_("failed to delete file %s"), path
);
107 static void xrmdir(const char *path
)
109 path
= get_mtime_path(path
);
111 die_errno(_("failed to delete directory %s"), path
);
114 static void avoid_racy(void)
117 * not use if we could usleep(10) if USE_NSEC is defined. The
118 * field nsec could be there, but the OS could choose to
124 static int test_if_untracked_cache_is_supported(void)
127 struct stat_data base
;
131 strbuf_addstr(&mtime_dir
, "mtime-test-XXXXXX");
132 if (!mkdtemp(mtime_dir
.buf
))
133 die_errno("Could not make temporary directory");
136 fprintf(stderr
, _("Testing mtime in '%s' "), cwd
);
139 atexit(remove_test_directory
);
140 xstat_mtime_dir(&st
);
141 fill_stat_data(&base
, &st
);
145 fd
= create_file("newfile");
146 xstat_mtime_dir(&st
);
147 if (!match_stat_data(&base
, &st
)) {
150 fprintf_ln(stderr
,_("directory stat info does not "
151 "change after adding a new file"));
154 fill_stat_data(&base
, &st
);
159 xstat_mtime_dir(&st
);
160 if (!match_stat_data(&base
, &st
)) {
163 fprintf_ln(stderr
, _("directory stat info does not change "
164 "after adding a new directory"));
167 fill_stat_data(&base
, &st
);
171 write_or_die(fd
, "data", 4);
173 xstat_mtime_dir(&st
);
174 if (match_stat_data(&base
, &st
)) {
176 fprintf_ln(stderr
, _("directory stat info changes "
177 "after updating a file"));
183 close(create_file("new-dir/new"));
184 xstat_mtime_dir(&st
);
185 if (match_stat_data(&base
, &st
)) {
187 fprintf_ln(stderr
, _("directory stat info changes after "
188 "adding a file inside subdirectory"));
195 xstat_mtime_dir(&st
);
196 if (!match_stat_data(&base
, &st
)) {
198 fprintf_ln(stderr
, _("directory stat info does not "
199 "change after deleting a file"));
202 fill_stat_data(&base
, &st
);
206 xunlink("new-dir/new");
208 xstat_mtime_dir(&st
);
209 if (!match_stat_data(&base
, &st
)) {
211 fprintf_ln(stderr
, _("directory stat info does not "
212 "change after deleting a directory"));
216 if (rmdir(mtime_dir
.buf
))
217 die_errno(_("failed to delete directory %s"), mtime_dir
.buf
);
218 fprintf_ln(stderr
, _(" OK"));
222 strbuf_release(&mtime_dir
);
226 static int mark_ce_flags(const char *path
, int flag
, int mark
)
228 int namelen
= strlen(path
);
229 int pos
= cache_name_pos(path
, namelen
);
232 active_cache
[pos
]->ce_flags
|= flag
;
234 active_cache
[pos
]->ce_flags
&= ~flag
;
235 active_cache
[pos
]->ce_flags
|= CE_UPDATE_IN_BASE
;
236 cache_tree_invalidate_path(&the_index
, path
);
237 active_cache_changed
|= CE_ENTRY_CHANGED
;
243 static int remove_one_path(const char *path
)
246 return error("%s: does not exist and --remove not passed", path
);
247 if (remove_file_from_cache(path
))
248 return error("%s: cannot remove from the index", path
);
253 * Handle a path that couldn't be lstat'ed. It's either:
254 * - missing file (ENOENT or ENOTDIR). That's ok if we're
255 * supposed to be removing it and the removal actually
257 * - permission error. That's never ok.
259 static int process_lstat_error(const char *path
, int err
)
261 if (is_missing_file_error(err
))
262 return remove_one_path(path
);
263 return error("lstat(\"%s\"): %s", path
, strerror(err
));
266 static int add_one_path(const struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
269 struct cache_entry
*ce
;
271 /* Was the old index entry already up-to-date? */
272 if (old
&& !ce_stage(old
) && !ce_match_stat(old
, st
, 0))
275 size
= cache_entry_size(len
);
276 ce
= xcalloc(1, size
);
277 memcpy(ce
->name
, path
, len
);
278 ce
->ce_flags
= create_ce_flags(0);
279 ce
->ce_namelen
= len
;
280 fill_stat_cache_info(ce
, st
);
281 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
283 if (index_path(ce
->oid
.hash
, path
, st
,
284 info_only
? 0 : HASH_WRITE_OBJECT
)) {
288 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
289 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
290 if (add_cache_entry(ce
, option
))
291 return error("%s: cannot add to the index - missing --add option?", path
);
296 * Handle a path that was a directory. Four cases:
298 * - it's already a gitlink in the index, and we keep it that
299 * way, and update it if we can (if we cannot find the HEAD,
300 * we're going to keep it unchanged in the index!)
302 * - it's a *file* in the index, in which case it should be
303 * removed as a file if removal is allowed, since it doesn't
304 * exist as such any more. If removal isn't allowed, it's
307 * (NOTE! This is old and arguably fairly strange behaviour.
308 * We might want to make this an error unconditionally, and
309 * use "--force-remove" if you actually want to force removal).
311 * - it used to exist as a subdirectory (ie multiple files with
312 * this particular prefix) in the index, in which case it's wrong
313 * to try to update it as a directory.
315 * - it doesn't exist at all in the index, but it is a valid
316 * git directory, and it should be *added* as a gitlink.
318 static int process_directory(const char *path
, int len
, struct stat
*st
)
320 struct object_id oid
;
321 int pos
= cache_name_pos(path
, len
);
323 /* Exact match: file or existing gitlink */
325 const struct cache_entry
*ce
= active_cache
[pos
];
326 if (S_ISGITLINK(ce
->ce_mode
)) {
328 /* Do nothing to the index if there is no HEAD! */
329 if (resolve_gitlink_ref(path
, "HEAD", oid
.hash
) < 0)
332 return add_one_path(ce
, path
, len
, st
);
334 /* Should this be an unconditional error? */
335 return remove_one_path(path
);
338 /* Inexact match: is there perhaps a subdirectory match? */
340 while (pos
< active_nr
) {
341 const struct cache_entry
*ce
= active_cache
[pos
++];
343 if (strncmp(ce
->name
, path
, len
))
345 if (ce
->name
[len
] > '/')
347 if (ce
->name
[len
] < '/')
350 /* Subdirectory match - error out */
351 return error("%s: is a directory - add individual files instead", path
);
354 /* No match - should we add it as a gitlink? */
355 if (!resolve_gitlink_ref(path
, "HEAD", oid
.hash
))
356 return add_one_path(NULL
, path
, len
, st
);
359 return error("%s: is a directory - add files inside instead", path
);
362 static int process_path(const char *path
)
366 const struct cache_entry
*ce
;
369 if (has_symlink_leading_path(path
, len
))
370 return error("'%s' is beyond a symbolic link", path
);
372 pos
= cache_name_pos(path
, len
);
373 ce
= pos
< 0 ? NULL
: active_cache
[pos
];
374 if (ce
&& ce_skip_worktree(ce
)) {
376 * working directory version is assumed "good"
377 * so updating it does not make sense.
378 * On the other hand, removing it from index should work
380 if (allow_remove
&& remove_file_from_cache(path
))
381 return error("%s: cannot remove from the index", path
);
386 * First things first: get the stat information, to decide
387 * what to do about the pathname!
389 if (lstat(path
, &st
) < 0)
390 return process_lstat_error(path
, errno
);
392 if (S_ISDIR(st
.st_mode
))
393 return process_directory(path
, len
, &st
);
395 return add_one_path(ce
, path
, len
, &st
);
398 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
399 const char *path
, int stage
)
401 int size
, len
, option
;
402 struct cache_entry
*ce
;
404 if (!verify_path(path
))
405 return error("Invalid path '%s'", path
);
408 size
= cache_entry_size(len
);
409 ce
= xcalloc(1, size
);
411 oidcpy(&ce
->oid
, oid
);
412 memcpy(ce
->name
, path
, len
);
413 ce
->ce_flags
= create_ce_flags(stage
);
414 ce
->ce_namelen
= len
;
415 ce
->ce_mode
= create_ce_mode(mode
);
416 if (assume_unchanged
)
417 ce
->ce_flags
|= CE_VALID
;
418 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
419 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
420 if (add_cache_entry(ce
, option
))
421 return error("%s: cannot add to the index - missing --add option?",
423 report("add '%s'", path
);
427 static void chmod_path(char flip
, const char *path
)
430 struct cache_entry
*ce
;
432 pos
= cache_name_pos(path
, strlen(path
));
435 ce
= active_cache
[pos
];
436 if (chmod_cache_entry(ce
, flip
) < 0)
439 report("chmod %cx '%s'", flip
, path
);
442 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
445 static void update_one(const char *path
)
447 if (!verify_path(path
)) {
448 fprintf(stderr
, "Ignoring path %s\n", path
);
451 if (mark_valid_only
) {
452 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
453 die("Unable to mark file %s", path
);
456 if (mark_skip_worktree_only
) {
457 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
458 die("Unable to mark file %s", path
);
463 if (remove_file_from_cache(path
))
464 die("git update-index: unable to remove %s", path
);
465 report("remove '%s'", path
);
468 if (process_path(path
))
469 die("Unable to process path %s", path
);
470 report("add '%s'", path
);
473 static void read_index_info(int nul_term_line
)
475 struct strbuf buf
= STRBUF_INIT
;
476 struct strbuf uq
= STRBUF_INIT
;
477 strbuf_getline_fn getline_fn
;
479 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
480 while (getline_fn(&buf
, stdin
) != EOF
) {
483 struct object_id oid
;
488 /* This reads lines formatted in one of three formats:
490 * (1) mode SP sha1 TAB path
491 * The first format is what "git apply --index-info"
492 * reports, and used to reconstruct a partial tree
493 * that is used for phony merge base tree when falling
494 * back on 3-way merge.
496 * (2) mode SP type SP sha1 TAB path
497 * The second format is to stuff "git ls-tree" output
498 * into the index file.
500 * (3) mode SP sha1 SP stage TAB path
501 * This format is to put higher order stages into the
502 * index file and matches "git ls-files --stage" output.
505 ul
= strtoul(buf
.buf
, &ptr
, 8);
506 if (ptr
== buf
.buf
|| *ptr
!= ' '
507 || errno
|| (unsigned int) ul
!= ul
)
511 tab
= strchr(ptr
, '\t');
512 if (!tab
|| tab
- ptr
< GIT_SHA1_HEXSZ
+ 1)
515 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
516 stage
= tab
[-1] - '0';
517 ptr
= tab
+ 1; /* point at the head of path */
518 tab
= tab
- 2; /* point at tail of sha1 */
522 ptr
= tab
+ 1; /* point at the head of path */
525 if (get_oid_hex(tab
- GIT_SHA1_HEXSZ
, &oid
) ||
526 tab
[-(GIT_SHA1_HEXSZ
+ 1)] != ' ')
530 if (!nul_term_line
&& path_name
[0] == '"') {
532 if (unquote_c_style(&uq
, path_name
, NULL
)) {
533 die("git update-index: bad quoting of path name");
538 if (!verify_path(path_name
)) {
539 fprintf(stderr
, "Ignoring path %s\n", path_name
);
544 /* mode == 0 means there is no such path -- remove */
545 if (remove_file_from_cache(path_name
))
546 die("git update-index: unable to remove %s",
550 /* mode ' ' sha1 '\t' name
551 * ptr[-1] points at tab,
552 * ptr[-41] is at the beginning of sha1
554 ptr
[-(GIT_SHA1_HEXSZ
+ 2)] = ptr
[-1] = 0;
555 if (add_cacheinfo(mode
, &oid
, path_name
, stage
))
556 die("git update-index: unable to update %s",
562 die("malformed index info %s", buf
.buf
);
564 strbuf_release(&buf
);
568 static const char * const update_index_usage
[] = {
569 N_("git update-index [<options>] [--] [<file>...]"),
573 static struct object_id head_oid
;
574 static struct object_id merge_head_oid
;
576 static struct cache_entry
*read_one_ent(const char *which
,
577 struct object_id
*ent
, const char *path
,
578 int namelen
, int stage
)
581 struct object_id oid
;
583 struct cache_entry
*ce
;
585 if (get_tree_entry(ent
->hash
, path
, oid
.hash
, &mode
)) {
587 error("%s: not in %s branch.", path
, which
);
590 if (mode
== S_IFDIR
) {
592 error("%s: not a blob in %s branch.", path
, which
);
595 size
= cache_entry_size(namelen
);
596 ce
= xcalloc(1, size
);
598 oidcpy(&ce
->oid
, &oid
);
599 memcpy(ce
->name
, path
, namelen
);
600 ce
->ce_flags
= create_ce_flags(stage
);
601 ce
->ce_namelen
= namelen
;
602 ce
->ce_mode
= create_ce_mode(mode
);
606 static int unresolve_one(const char *path
)
608 int namelen
= strlen(path
);
611 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
613 /* See if there is such entry in the index. */
614 pos
= cache_name_pos(path
, namelen
);
617 pos
= unmerge_cache_entry_at(pos
);
618 if (pos
< active_nr
) {
619 const struct cache_entry
*ce
= active_cache
[pos
];
621 ce_namelen(ce
) == namelen
&&
622 !memcmp(ce
->name
, path
, namelen
))
625 /* no resolve-undo information; fall back */
627 /* If there isn't, either it is unmerged, or
628 * resolved as "removed" by mistake. We do not
629 * want to do anything in the former case.
632 if (pos
< active_nr
) {
633 const struct cache_entry
*ce
= active_cache
[pos
];
634 if (ce_namelen(ce
) == namelen
&&
635 !memcmp(ce
->name
, path
, namelen
)) {
637 "%s: skipping still unmerged path.\n",
644 /* Grab blobs from given path from HEAD and MERGE_HEAD,
645 * stuff HEAD version in stage #2,
646 * stuff MERGE_HEAD version in stage #3.
648 ce_2
= read_one_ent("our", &head_oid
, path
, namelen
, 2);
649 ce_3
= read_one_ent("their", &merge_head_oid
, path
, namelen
, 3);
651 if (!ce_2
|| !ce_3
) {
655 if (!oidcmp(&ce_2
->oid
, &ce_3
->oid
) &&
656 ce_2
->ce_mode
== ce_3
->ce_mode
) {
657 fprintf(stderr
, "%s: identical in both, skipping.\n",
662 remove_file_from_cache(path
);
663 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
664 error("%s: cannot add our version to the index.", path
);
668 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
670 error("%s: cannot add their version to the index.", path
);
678 static void read_head_pointers(void)
680 if (read_ref("HEAD", head_oid
.hash
))
681 die("No HEAD -- no initial commit yet?");
682 if (read_ref("MERGE_HEAD", merge_head_oid
.hash
)) {
683 fprintf(stderr
, "Not in the middle of a merge.\n");
688 static int do_unresolve(int ac
, const char **av
,
689 const char *prefix
, int prefix_length
)
694 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
695 * are not doing a merge, so exit with success status.
697 read_head_pointers();
699 for (i
= 1; i
< ac
; i
++) {
700 const char *arg
= av
[i
];
701 char *p
= prefix_path(prefix
, prefix_length
, arg
);
702 err
|= unresolve_one(p
);
708 static int do_reupdate(int ac
, const char **av
,
709 const char *prefix
, int prefix_length
)
711 /* Read HEAD and run update-index on paths that are
712 * merged and already different between index and HEAD.
716 struct pathspec pathspec
;
718 parse_pathspec(&pathspec
, 0,
722 if (read_ref("HEAD", head_oid
.hash
))
723 /* If there is no HEAD, that means it is an initial
724 * commit. Update everything in the index.
728 for (pos
= 0; pos
< active_nr
; pos
++) {
729 const struct cache_entry
*ce
= active_cache
[pos
];
730 struct cache_entry
*old
= NULL
;
734 if (ce_stage(ce
) || !ce_path_match(ce
, &pathspec
, NULL
))
737 old
= read_one_ent(NULL
, &head_oid
,
738 ce
->name
, ce_namelen(ce
), 0);
739 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
740 !oidcmp(&ce
->oid
, &old
->oid
)) {
742 continue; /* unchanged */
744 /* Be careful. The working tree may not have the
745 * path anymore, in which case, under 'allow_remove',
746 * or worse yet 'allow_replace', active_nr may decrease.
749 path
= xstrdup(ce
->name
);
753 if (save_nr
!= active_nr
)
756 clear_pathspec(&pathspec
);
760 struct refresh_params
{
765 static int refresh(struct refresh_params
*o
, unsigned int flag
)
768 read_cache_preload(NULL
);
769 *o
->has_errors
|= refresh_cache(o
->flags
| flag
);
773 static int refresh_callback(const struct option
*opt
,
774 const char *arg
, int unset
)
776 return refresh(opt
->value
, 0);
779 static int really_refresh_callback(const struct option
*opt
,
780 const char *arg
, int unset
)
782 return refresh(opt
->value
, REFRESH_REALLY
);
785 static int chmod_callback(const struct option
*opt
,
786 const char *arg
, int unset
)
788 char *flip
= opt
->value
;
789 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
790 return error("option 'chmod' expects \"+x\" or \"-x\"");
795 static int resolve_undo_clear_callback(const struct option
*opt
,
796 const char *arg
, int unset
)
798 resolve_undo_clear();
802 static int parse_new_style_cacheinfo(const char *arg
,
804 struct object_id
*oid
,
814 ul
= strtoul(arg
, &endp
, 8);
815 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
816 return -1; /* not a new-style cacheinfo */
819 if (get_oid_hex(endp
, oid
) || endp
[GIT_SHA1_HEXSZ
] != ',')
821 *path
= endp
+ GIT_SHA1_HEXSZ
+ 1;
825 static int cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
826 const struct option
*opt
, int unset
)
828 struct object_id oid
;
832 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, &oid
, &path
)) {
833 if (add_cacheinfo(mode
, &oid
, path
, 0))
834 die("git update-index: --cacheinfo cannot add %s", path
);
840 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
841 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
842 get_oid_hex(*++ctx
->argv
, &oid
) ||
843 add_cacheinfo(mode
, &oid
, *++ctx
->argv
, 0))
844 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
849 static int stdin_cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
850 const struct option
*opt
, int unset
)
852 int *nul_term_line
= opt
->value
;
855 return error("option '%s' must be the last argument", opt
->long_name
);
856 allow_add
= allow_replace
= allow_remove
= 1;
857 read_index_info(*nul_term_line
);
861 static int stdin_callback(struct parse_opt_ctx_t
*ctx
,
862 const struct option
*opt
, int unset
)
864 int *read_from_stdin
= opt
->value
;
867 return error("option '%s' must be the last argument", opt
->long_name
);
868 *read_from_stdin
= 1;
872 static int unresolve_callback(struct parse_opt_ctx_t
*ctx
,
873 const struct option
*opt
, int flags
)
875 int *has_errors
= opt
->value
;
876 const char *prefix
= startup_info
->prefix
;
878 /* consume remaining arguments. */
879 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
880 prefix
, prefix
? strlen(prefix
) : 0);
882 active_cache_changed
= 0;
884 ctx
->argv
+= ctx
->argc
- 1;
889 static int reupdate_callback(struct parse_opt_ctx_t
*ctx
,
890 const struct option
*opt
, int flags
)
892 int *has_errors
= opt
->value
;
893 const char *prefix
= startup_info
->prefix
;
895 /* consume remaining arguments. */
897 *has_errors
= do_reupdate(ctx
->argc
, ctx
->argv
,
898 prefix
, prefix
? strlen(prefix
) : 0);
900 active_cache_changed
= 0;
902 ctx
->argv
+= ctx
->argc
- 1;
907 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
909 int newfd
, entries
, has_errors
= 0, nul_term_line
= 0;
910 enum uc_mode untracked_cache
= UC_UNSPECIFIED
;
911 int read_from_stdin
= 0;
912 int prefix_length
= prefix
? strlen(prefix
) : 0;
913 int preferred_index_format
= 0;
914 char set_executable_bit
= 0;
915 struct refresh_params refresh_args
= {0, &has_errors
};
917 int split_index
= -1;
918 struct lock_file
*lock_file
;
919 struct parse_opt_ctx_t ctx
;
920 strbuf_getline_fn getline_fn
;
921 int parseopt_state
= PARSE_OPT_UNKNOWN
;
922 struct option options
[] = {
923 OPT_BIT('q', NULL
, &refresh_args
.flags
,
924 N_("continue refresh even when index needs update"),
926 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
927 N_("refresh: ignore submodules"),
928 REFRESH_IGNORE_SUBMODULES
),
929 OPT_SET_INT(0, "add", &allow_add
,
930 N_("do not ignore new files"), 1),
931 OPT_SET_INT(0, "replace", &allow_replace
,
932 N_("let files replace directories and vice-versa"), 1),
933 OPT_SET_INT(0, "remove", &allow_remove
,
934 N_("notice files missing from worktree"), 1),
935 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
936 N_("refresh even if index contains unmerged entries"),
938 {OPTION_CALLBACK
, 0, "refresh", &refresh_args
, NULL
,
939 N_("refresh stat information"),
940 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
942 {OPTION_CALLBACK
, 0, "really-refresh", &refresh_args
, NULL
,
943 N_("like --refresh, but ignore assume-unchanged setting"),
944 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
945 really_refresh_callback
},
946 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
947 N_("<mode>,<object>,<path>"),
948 N_("add the specified entry to the index"),
949 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
950 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
951 (parse_opt_cb
*) cacheinfo_callback
},
952 {OPTION_CALLBACK
, 0, "chmod", &set_executable_bit
, N_("(+/-)x"),
953 N_("override the executable bit of the listed files"),
954 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
956 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
957 N_("mark files as \"not changing\""),
958 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
959 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
960 N_("clear assumed-unchanged bit"),
961 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
962 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
963 N_("mark files as \"index-only\""),
964 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
965 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
966 N_("clear skip-worktree bit"),
967 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
968 OPT_SET_INT(0, "info-only", &info_only
,
969 N_("add to index only; do not add content to object database"), 1),
970 OPT_SET_INT(0, "force-remove", &force_remove
,
971 N_("remove named paths even if present in worktree"), 1),
972 OPT_BOOL('z', NULL
, &nul_term_line
,
973 N_("with --stdin: input lines are terminated by null bytes")),
974 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
975 N_("read list of paths to be updated from standard input"),
976 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
977 (parse_opt_cb
*) stdin_callback
},
978 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &nul_term_line
, NULL
,
979 N_("add entries from standard input to the index"),
980 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
981 (parse_opt_cb
*) stdin_cacheinfo_callback
},
982 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
983 N_("repopulate stages #2 and #3 for the listed paths"),
984 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
985 (parse_opt_cb
*) unresolve_callback
},
986 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
987 N_("only update entries that differ from HEAD"),
988 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
989 (parse_opt_cb
*) reupdate_callback
},
990 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
991 N_("ignore files missing from worktree"),
992 REFRESH_IGNORE_MISSING
),
993 OPT_SET_INT(0, "verbose", &verbose
,
994 N_("report actions to standard output"), 1),
995 {OPTION_CALLBACK
, 0, "clear-resolve-undo", NULL
, NULL
,
996 N_("(for porcelains) forget saved unresolved conflicts"),
997 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
998 resolve_undo_clear_callback
},
999 OPT_INTEGER(0, "index-version", &preferred_index_format
,
1000 N_("write index in this format")),
1001 OPT_BOOL(0, "split-index", &split_index
,
1002 N_("enable or disable split index")),
1003 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1004 N_("enable/disable untracked cache")),
1005 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache
,
1006 N_("test if the filesystem supports untracked cache"), UC_TEST
),
1007 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1008 N_("enable untracked cache without testing the filesystem"), UC_FORCE
),
1012 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1013 usage_with_options(update_index_usage
, options
);
1015 git_config(git_default_config
, NULL
);
1017 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
1018 lock_file
= xcalloc(1, sizeof(struct lock_file
));
1020 /* we will diagnose later if it turns out that we need to update it */
1021 newfd
= hold_locked_index(lock_file
, 0);
1025 entries
= read_cache();
1027 die("cache corrupted");
1030 * Custom copy of parse_options() because we want to handle
1031 * filename arguments as they come.
1033 parse_options_start(&ctx
, argc
, argv
, prefix
,
1034 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
1036 if (parseopt_state
!= PARSE_OPT_DONE
)
1037 parseopt_state
= parse_options_step(&ctx
, options
,
1038 update_index_usage
);
1041 switch (parseopt_state
) {
1042 case PARSE_OPT_HELP
:
1044 case PARSE_OPT_NON_OPTION
:
1045 case PARSE_OPT_DONE
:
1047 const char *path
= ctx
.argv
[0];
1051 p
= prefix_path(prefix
, prefix_length
, path
);
1053 if (set_executable_bit
)
1054 chmod_path(set_executable_bit
, p
);
1060 case PARSE_OPT_UNKNOWN
:
1061 if (ctx
.argv
[0][1] == '-')
1062 error("unknown option '%s'", ctx
.argv
[0] + 2);
1064 error("unknown switch '%c'", *ctx
.opt
);
1065 usage_with_options(update_index_usage
, options
);
1068 argc
= parse_options_end(&ctx
);
1070 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
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
;
1085 struct strbuf unquoted
= STRBUF_INIT
;
1088 while (getline_fn(&buf
, stdin
) != EOF
) {
1090 if (!nul_term_line
&& buf
.buf
[0] == '"') {
1091 strbuf_reset(&unquoted
);
1092 if (unquote_c_style(&unquoted
, buf
.buf
, NULL
))
1093 die("line is badly quoted");
1094 strbuf_swap(&buf
, &unquoted
);
1096 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
1098 if (set_executable_bit
)
1099 chmod_path(set_executable_bit
, p
);
1102 strbuf_release(&unquoted
);
1103 strbuf_release(&buf
);
1106 if (split_index
> 0) {
1107 if (git_config_get_split_index() == 0)
1108 warning(_("core.splitIndex is set to false; "
1109 "remove or change it, if you really want to "
1110 "enable split index"));
1111 if (the_index
.split_index
)
1112 the_index
.cache_changed
|= SPLIT_INDEX_ORDERED
;
1114 add_split_index(&the_index
);
1115 } else if (!split_index
) {
1116 if (git_config_get_split_index() == 1)
1117 warning(_("core.splitIndex is set to true; "
1118 "remove or change it, if you really want to "
1119 "disable split index"));
1120 remove_split_index(&the_index
);
1123 switch (untracked_cache
) {
1124 case UC_UNSPECIFIED
:
1127 if (git_config_get_untracked_cache() == 1)
1128 warning(_("core.untrackedCache is set to true; "
1129 "remove or change it, if you really want to "
1130 "disable the untracked cache"));
1131 remove_untracked_cache(&the_index
);
1132 report(_("Untracked cache disabled"));
1136 return !test_if_untracked_cache_is_supported();
1139 if (git_config_get_untracked_cache() == 0)
1140 warning(_("core.untrackedCache is set to false; "
1141 "remove or change it, if you really want to "
1142 "enable the untracked cache"));
1143 add_untracked_cache(&the_index
);
1144 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1147 die("BUG: bad untracked_cache value: %d", untracked_cache
);
1150 if (active_cache_changed
) {
1152 if (refresh_args
.flags
& REFRESH_QUIET
)
1154 unable_to_lock_die(get_index_file(), lock_error
);
1156 if (write_locked_index(&the_index
, lock_file
, COMMIT_LOCK
))
1157 die("Unable to write new index file");
1160 rollback_lock_file(lock_file
);
1162 return has_errors
? 1 : 0;