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
, 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
)) {
292 return error("%s: cannot add to the index - missing --add option?", path
);
298 * Handle a path that was a directory. Four cases:
300 * - it's already a gitlink in the index, and we keep it that
301 * way, and update it if we can (if we cannot find the HEAD,
302 * we're going to keep it unchanged in the index!)
304 * - it's a *file* in the index, in which case it should be
305 * removed as a file if removal is allowed, since it doesn't
306 * exist as such any more. If removal isn't allowed, it's
309 * (NOTE! This is old and arguably fairly strange behaviour.
310 * We might want to make this an error unconditionally, and
311 * use "--force-remove" if you actually want to force removal).
313 * - it used to exist as a subdirectory (ie multiple files with
314 * this particular prefix) in the index, in which case it's wrong
315 * to try to update it as a directory.
317 * - it doesn't exist at all in the index, but it is a valid
318 * git directory, and it should be *added* as a gitlink.
320 static int process_directory(const char *path
, int len
, struct stat
*st
)
322 struct object_id oid
;
323 int pos
= cache_name_pos(path
, len
);
325 /* Exact match: file or existing gitlink */
327 const struct cache_entry
*ce
= active_cache
[pos
];
328 if (S_ISGITLINK(ce
->ce_mode
)) {
330 /* Do nothing to the index if there is no HEAD! */
331 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
334 return add_one_path(ce
, path
, len
, st
);
336 /* Should this be an unconditional error? */
337 return remove_one_path(path
);
340 /* Inexact match: is there perhaps a subdirectory match? */
342 while (pos
< active_nr
) {
343 const struct cache_entry
*ce
= active_cache
[pos
++];
345 if (strncmp(ce
->name
, path
, len
))
347 if (ce
->name
[len
] > '/')
349 if (ce
->name
[len
] < '/')
352 /* Subdirectory match - error out */
353 return error("%s: is a directory - add individual files instead", path
);
356 /* No match - should we add it as a gitlink? */
357 if (!resolve_gitlink_ref(path
, "HEAD", &oid
))
358 return add_one_path(NULL
, path
, len
, st
);
361 return error("%s: is a directory - add files inside instead", path
);
364 static int process_path(const char *path
)
368 const struct cache_entry
*ce
;
371 if (has_symlink_leading_path(path
, len
))
372 return error("'%s' is beyond a symbolic link", path
);
374 pos
= cache_name_pos(path
, len
);
375 ce
= pos
< 0 ? NULL
: active_cache
[pos
];
376 if (ce
&& ce_skip_worktree(ce
)) {
378 * working directory version is assumed "good"
379 * so updating it does not make sense.
380 * On the other hand, removing it from index should work
382 if (allow_remove
&& remove_file_from_cache(path
))
383 return error("%s: cannot remove from the index", path
);
388 * First things first: get the stat information, to decide
389 * what to do about the pathname!
391 if (lstat(path
, &st
) < 0)
392 return process_lstat_error(path
, errno
);
394 if (S_ISDIR(st
.st_mode
))
395 return process_directory(path
, len
, &st
);
397 return add_one_path(ce
, path
, len
, &st
);
400 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
401 const char *path
, int stage
)
403 int size
, len
, option
;
404 struct cache_entry
*ce
;
406 if (!verify_path(path
))
407 return error("Invalid path '%s'", path
);
410 size
= cache_entry_size(len
);
411 ce
= xcalloc(1, size
);
413 oidcpy(&ce
->oid
, oid
);
414 memcpy(ce
->name
, path
, len
);
415 ce
->ce_flags
= create_ce_flags(stage
);
416 ce
->ce_namelen
= len
;
417 ce
->ce_mode
= create_ce_mode(mode
);
418 if (assume_unchanged
)
419 ce
->ce_flags
|= CE_VALID
;
420 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
421 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
422 if (add_cache_entry(ce
, option
))
423 return error("%s: cannot add to the index - missing --add option?",
425 report("add '%s'", path
);
429 static void chmod_path(char flip
, const char *path
)
432 struct cache_entry
*ce
;
434 pos
= cache_name_pos(path
, strlen(path
));
437 ce
= active_cache
[pos
];
438 if (chmod_cache_entry(ce
, flip
) < 0)
441 report("chmod %cx '%s'", flip
, path
);
444 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
447 static void update_one(const char *path
)
449 if (!verify_path(path
)) {
450 fprintf(stderr
, "Ignoring path %s\n", path
);
453 if (mark_valid_only
) {
454 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
455 die("Unable to mark file %s", path
);
458 if (mark_skip_worktree_only
) {
459 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
460 die("Unable to mark file %s", path
);
465 if (remove_file_from_cache(path
))
466 die("git update-index: unable to remove %s", path
);
467 report("remove '%s'", path
);
470 if (process_path(path
))
471 die("Unable to process path %s", path
);
472 report("add '%s'", path
);
475 static void read_index_info(int nul_term_line
)
477 struct strbuf buf
= STRBUF_INIT
;
478 struct strbuf uq
= STRBUF_INIT
;
479 strbuf_getline_fn getline_fn
;
481 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
482 while (getline_fn(&buf
, stdin
) != EOF
) {
485 struct object_id oid
;
490 /* This reads lines formatted in one of three formats:
492 * (1) mode SP sha1 TAB path
493 * The first format is what "git apply --index-info"
494 * reports, and used to reconstruct a partial tree
495 * that is used for phony merge base tree when falling
496 * back on 3-way merge.
498 * (2) mode SP type SP sha1 TAB path
499 * The second format is to stuff "git ls-tree" output
500 * into the index file.
502 * (3) mode SP sha1 SP stage TAB path
503 * This format is to put higher order stages into the
504 * index file and matches "git ls-files --stage" output.
507 ul
= strtoul(buf
.buf
, &ptr
, 8);
508 if (ptr
== buf
.buf
|| *ptr
!= ' '
509 || errno
|| (unsigned int) ul
!= ul
)
513 tab
= strchr(ptr
, '\t');
514 if (!tab
|| tab
- ptr
< GIT_SHA1_HEXSZ
+ 1)
517 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
518 stage
= tab
[-1] - '0';
519 ptr
= tab
+ 1; /* point at the head of path */
520 tab
= tab
- 2; /* point at tail of sha1 */
524 ptr
= tab
+ 1; /* point at the head of path */
527 if (get_oid_hex(tab
- GIT_SHA1_HEXSZ
, &oid
) ||
528 tab
[-(GIT_SHA1_HEXSZ
+ 1)] != ' ')
532 if (!nul_term_line
&& path_name
[0] == '"') {
534 if (unquote_c_style(&uq
, path_name
, NULL
)) {
535 die("git update-index: bad quoting of path name");
540 if (!verify_path(path_name
)) {
541 fprintf(stderr
, "Ignoring path %s\n", path_name
);
546 /* mode == 0 means there is no such path -- remove */
547 if (remove_file_from_cache(path_name
))
548 die("git update-index: unable to remove %s",
552 /* mode ' ' sha1 '\t' name
553 * ptr[-1] points at tab,
554 * ptr[-41] is at the beginning of sha1
556 ptr
[-(GIT_SHA1_HEXSZ
+ 2)] = ptr
[-1] = 0;
557 if (add_cacheinfo(mode
, &oid
, path_name
, stage
))
558 die("git update-index: unable to update %s",
564 die("malformed index info %s", buf
.buf
);
566 strbuf_release(&buf
);
570 static const char * const update_index_usage
[] = {
571 N_("git update-index [<options>] [--] [<file>...]"),
575 static struct object_id head_oid
;
576 static struct object_id merge_head_oid
;
578 static struct cache_entry
*read_one_ent(const char *which
,
579 struct object_id
*ent
, const char *path
,
580 int namelen
, int stage
)
583 struct object_id oid
;
585 struct cache_entry
*ce
;
587 if (get_tree_entry(ent
->hash
, path
, oid
.hash
, &mode
)) {
589 error("%s: not in %s branch.", path
, which
);
592 if (mode
== S_IFDIR
) {
594 error("%s: not a blob in %s branch.", path
, which
);
597 size
= cache_entry_size(namelen
);
598 ce
= xcalloc(1, size
);
600 oidcpy(&ce
->oid
, &oid
);
601 memcpy(ce
->name
, path
, namelen
);
602 ce
->ce_flags
= create_ce_flags(stage
);
603 ce
->ce_namelen
= namelen
;
604 ce
->ce_mode
= create_ce_mode(mode
);
608 static int unresolve_one(const char *path
)
610 int namelen
= strlen(path
);
613 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
615 /* See if there is such entry in the index. */
616 pos
= cache_name_pos(path
, namelen
);
619 pos
= unmerge_cache_entry_at(pos
);
620 if (pos
< active_nr
) {
621 const struct cache_entry
*ce
= active_cache
[pos
];
623 ce_namelen(ce
) == namelen
&&
624 !memcmp(ce
->name
, path
, namelen
))
627 /* no resolve-undo information; fall back */
629 /* If there isn't, either it is unmerged, or
630 * resolved as "removed" by mistake. We do not
631 * want to do anything in the former case.
634 if (pos
< active_nr
) {
635 const struct cache_entry
*ce
= active_cache
[pos
];
636 if (ce_namelen(ce
) == namelen
&&
637 !memcmp(ce
->name
, path
, namelen
)) {
639 "%s: skipping still unmerged path.\n",
646 /* Grab blobs from given path from HEAD and MERGE_HEAD,
647 * stuff HEAD version in stage #2,
648 * stuff MERGE_HEAD version in stage #3.
650 ce_2
= read_one_ent("our", &head_oid
, path
, namelen
, 2);
651 ce_3
= read_one_ent("their", &merge_head_oid
, path
, namelen
, 3);
653 if (!ce_2
|| !ce_3
) {
657 if (!oidcmp(&ce_2
->oid
, &ce_3
->oid
) &&
658 ce_2
->ce_mode
== ce_3
->ce_mode
) {
659 fprintf(stderr
, "%s: identical in both, skipping.\n",
664 remove_file_from_cache(path
);
665 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
666 error("%s: cannot add our version to the index.", path
);
670 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
672 error("%s: cannot add their version to the index.", path
);
680 static void read_head_pointers(void)
682 if (read_ref("HEAD", &head_oid
))
683 die("No HEAD -- no initial commit yet?");
684 if (read_ref("MERGE_HEAD", &merge_head_oid
)) {
685 fprintf(stderr
, "Not in the middle of a merge.\n");
690 static int do_unresolve(int ac
, const char **av
,
691 const char *prefix
, int prefix_length
)
696 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
697 * are not doing a merge, so exit with success status.
699 read_head_pointers();
701 for (i
= 1; i
< ac
; i
++) {
702 const char *arg
= av
[i
];
703 char *p
= prefix_path(prefix
, prefix_length
, arg
);
704 err
|= unresolve_one(p
);
710 static int do_reupdate(int ac
, const char **av
,
711 const char *prefix
, int prefix_length
)
713 /* Read HEAD and run update-index on paths that are
714 * merged and already different between index and HEAD.
718 struct pathspec pathspec
;
720 parse_pathspec(&pathspec
, 0,
724 if (read_ref("HEAD", &head_oid
))
725 /* If there is no HEAD, that means it is an initial
726 * commit. Update everything in the index.
730 for (pos
= 0; pos
< active_nr
; pos
++) {
731 const struct cache_entry
*ce
= active_cache
[pos
];
732 struct cache_entry
*old
= NULL
;
736 if (ce_stage(ce
) || !ce_path_match(ce
, &pathspec
, NULL
))
739 old
= read_one_ent(NULL
, &head_oid
,
740 ce
->name
, ce_namelen(ce
), 0);
741 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
742 !oidcmp(&ce
->oid
, &old
->oid
)) {
744 continue; /* unchanged */
746 /* Be careful. The working tree may not have the
747 * path anymore, in which case, under 'allow_remove',
748 * or worse yet 'allow_replace', active_nr may decrease.
751 path
= xstrdup(ce
->name
);
755 if (save_nr
!= active_nr
)
758 clear_pathspec(&pathspec
);
762 struct refresh_params
{
767 static int refresh(struct refresh_params
*o
, unsigned int flag
)
770 read_cache_preload(NULL
);
771 *o
->has_errors
|= refresh_cache(o
->flags
| flag
);
775 static int refresh_callback(const struct option
*opt
,
776 const char *arg
, int unset
)
778 return refresh(opt
->value
, 0);
781 static int really_refresh_callback(const struct option
*opt
,
782 const char *arg
, int unset
)
784 return refresh(opt
->value
, REFRESH_REALLY
);
787 static int chmod_callback(const struct option
*opt
,
788 const char *arg
, int unset
)
790 char *flip
= opt
->value
;
791 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
792 return error("option 'chmod' expects \"+x\" or \"-x\"");
797 static int resolve_undo_clear_callback(const struct option
*opt
,
798 const char *arg
, int unset
)
800 resolve_undo_clear();
804 static int parse_new_style_cacheinfo(const char *arg
,
806 struct object_id
*oid
,
816 ul
= strtoul(arg
, &endp
, 8);
817 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
818 return -1; /* not a new-style cacheinfo */
821 if (get_oid_hex(endp
, oid
) || endp
[GIT_SHA1_HEXSZ
] != ',')
823 *path
= endp
+ GIT_SHA1_HEXSZ
+ 1;
827 static int cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
828 const struct option
*opt
, int unset
)
830 struct object_id oid
;
834 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, &oid
, &path
)) {
835 if (add_cacheinfo(mode
, &oid
, path
, 0))
836 die("git update-index: --cacheinfo cannot add %s", path
);
842 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
843 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
844 get_oid_hex(*++ctx
->argv
, &oid
) ||
845 add_cacheinfo(mode
, &oid
, *++ctx
->argv
, 0))
846 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
851 static int stdin_cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
852 const struct option
*opt
, int unset
)
854 int *nul_term_line
= opt
->value
;
857 return error("option '%s' must be the last argument", opt
->long_name
);
858 allow_add
= allow_replace
= allow_remove
= 1;
859 read_index_info(*nul_term_line
);
863 static int stdin_callback(struct parse_opt_ctx_t
*ctx
,
864 const struct option
*opt
, int unset
)
866 int *read_from_stdin
= opt
->value
;
869 return error("option '%s' must be the last argument", opt
->long_name
);
870 *read_from_stdin
= 1;
874 static int unresolve_callback(struct parse_opt_ctx_t
*ctx
,
875 const struct option
*opt
, int flags
)
877 int *has_errors
= opt
->value
;
878 const char *prefix
= startup_info
->prefix
;
880 /* consume remaining arguments. */
881 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
882 prefix
, prefix
? strlen(prefix
) : 0);
884 active_cache_changed
= 0;
886 ctx
->argv
+= ctx
->argc
- 1;
891 static int reupdate_callback(struct parse_opt_ctx_t
*ctx
,
892 const struct option
*opt
, int flags
)
894 int *has_errors
= opt
->value
;
895 const char *prefix
= startup_info
->prefix
;
897 /* consume remaining arguments. */
899 *has_errors
= do_reupdate(ctx
->argc
, ctx
->argv
,
900 prefix
, prefix
? strlen(prefix
) : 0);
902 active_cache_changed
= 0;
904 ctx
->argv
+= ctx
->argc
- 1;
909 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
911 int newfd
, entries
, has_errors
= 0, nul_term_line
= 0;
912 enum uc_mode untracked_cache
= UC_UNSPECIFIED
;
913 int read_from_stdin
= 0;
914 int prefix_length
= prefix
? strlen(prefix
) : 0;
915 int preferred_index_format
= 0;
916 char set_executable_bit
= 0;
917 struct refresh_params refresh_args
= {0, &has_errors
};
919 int split_index
= -1;
920 struct lock_file lock_file
= LOCK_INIT
;
921 struct parse_opt_ctx_t ctx
;
922 strbuf_getline_fn getline_fn
;
923 int parseopt_state
= PARSE_OPT_UNKNOWN
;
924 struct option options
[] = {
925 OPT_BIT('q', NULL
, &refresh_args
.flags
,
926 N_("continue refresh even when index needs update"),
928 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
929 N_("refresh: ignore submodules"),
930 REFRESH_IGNORE_SUBMODULES
),
931 OPT_SET_INT(0, "add", &allow_add
,
932 N_("do not ignore new files"), 1),
933 OPT_SET_INT(0, "replace", &allow_replace
,
934 N_("let files replace directories and vice-versa"), 1),
935 OPT_SET_INT(0, "remove", &allow_remove
,
936 N_("notice files missing from worktree"), 1),
937 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
938 N_("refresh even if index contains unmerged entries"),
940 {OPTION_CALLBACK
, 0, "refresh", &refresh_args
, NULL
,
941 N_("refresh stat information"),
942 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
944 {OPTION_CALLBACK
, 0, "really-refresh", &refresh_args
, NULL
,
945 N_("like --refresh, but ignore assume-unchanged setting"),
946 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
947 really_refresh_callback
},
948 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
949 N_("<mode>,<object>,<path>"),
950 N_("add the specified entry to the index"),
951 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
952 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
953 (parse_opt_cb
*) cacheinfo_callback
},
954 {OPTION_CALLBACK
, 0, "chmod", &set_executable_bit
, N_("(+/-)x"),
955 N_("override the executable bit of the listed files"),
956 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
958 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
959 N_("mark files as \"not changing\""),
960 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
961 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
962 N_("clear assumed-unchanged bit"),
963 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
964 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
965 N_("mark files as \"index-only\""),
966 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
967 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
968 N_("clear skip-worktree bit"),
969 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
970 OPT_SET_INT(0, "info-only", &info_only
,
971 N_("add to index only; do not add content to object database"), 1),
972 OPT_SET_INT(0, "force-remove", &force_remove
,
973 N_("remove named paths even if present in worktree"), 1),
974 OPT_BOOL('z', NULL
, &nul_term_line
,
975 N_("with --stdin: input lines are terminated by null bytes")),
976 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
977 N_("read list of paths to be updated from standard input"),
978 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
979 (parse_opt_cb
*) stdin_callback
},
980 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &nul_term_line
, NULL
,
981 N_("add entries from standard input to the index"),
982 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
983 (parse_opt_cb
*) stdin_cacheinfo_callback
},
984 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
985 N_("repopulate stages #2 and #3 for the listed paths"),
986 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
987 (parse_opt_cb
*) unresolve_callback
},
988 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
989 N_("only update entries that differ from HEAD"),
990 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
991 (parse_opt_cb
*) reupdate_callback
},
992 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
993 N_("ignore files missing from worktree"),
994 REFRESH_IGNORE_MISSING
),
995 OPT_SET_INT(0, "verbose", &verbose
,
996 N_("report actions to standard output"), 1),
997 {OPTION_CALLBACK
, 0, "clear-resolve-undo", NULL
, NULL
,
998 N_("(for porcelains) forget saved unresolved conflicts"),
999 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1000 resolve_undo_clear_callback
},
1001 OPT_INTEGER(0, "index-version", &preferred_index_format
,
1002 N_("write index in this format")),
1003 OPT_BOOL(0, "split-index", &split_index
,
1004 N_("enable or disable split index")),
1005 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1006 N_("enable/disable untracked cache")),
1007 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache
,
1008 N_("test if the filesystem supports untracked cache"), UC_TEST
),
1009 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1010 N_("enable untracked cache without testing the filesystem"), UC_FORCE
),
1014 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1015 usage_with_options(update_index_usage
, options
);
1017 git_config(git_default_config
, NULL
);
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;