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"
19 #include "fsmonitor.h"
22 * Default to not allowing changes to the list of files. The
23 * tool doesn't actually care, but this makes it harder to add
24 * files to the revision control by mistake by doing something
25 * like "git update-index *" and suddenly having all the object
26 * files be revision controlled.
29 static int allow_remove
;
30 static int allow_replace
;
32 static int force_remove
;
34 static int mark_valid_only
;
35 static int mark_skip_worktree_only
;
36 static int mark_fsmonitor_only
;
39 static struct strbuf mtime_dir
= STRBUF_INIT
;
41 /* Untracked cache mode */
50 __attribute__((format (printf
, 1, 2)))
51 static void report(const char *fmt
, ...)
64 static void remove_test_directory(void)
67 remove_dir_recursively(&mtime_dir
, 0);
70 static const char *get_mtime_path(const char *path
)
72 static struct strbuf sb
= STRBUF_INIT
;
74 strbuf_addf(&sb
, "%s/%s", mtime_dir
.buf
, path
);
78 static void xmkdir(const char *path
)
80 path
= get_mtime_path(path
);
81 if (mkdir(path
, 0700))
82 die_errno(_("failed to create directory %s"), path
);
85 static int xstat_mtime_dir(struct stat
*st
)
87 if (stat(mtime_dir
.buf
, st
))
88 die_errno(_("failed to stat %s"), mtime_dir
.buf
);
92 static int create_file(const char *path
)
95 path
= get_mtime_path(path
);
96 fd
= open(path
, O_CREAT
| O_RDWR
, 0644);
98 die_errno(_("failed to create file %s"), path
);
102 static void xunlink(const char *path
)
104 path
= get_mtime_path(path
);
106 die_errno(_("failed to delete file %s"), path
);
109 static void xrmdir(const char *path
)
111 path
= get_mtime_path(path
);
113 die_errno(_("failed to delete directory %s"), path
);
116 static void avoid_racy(void)
119 * not use if we could usleep(10) if USE_NSEC is defined. The
120 * field nsec could be there, but the OS could choose to
126 static int test_if_untracked_cache_is_supported(void)
129 struct stat_data base
;
133 strbuf_addstr(&mtime_dir
, "mtime-test-XXXXXX");
134 if (!mkdtemp(mtime_dir
.buf
))
135 die_errno("Could not make temporary directory");
138 fprintf(stderr
, _("Testing mtime in '%s' "), cwd
);
141 atexit(remove_test_directory
);
142 xstat_mtime_dir(&st
);
143 fill_stat_data(&base
, &st
);
147 fd
= create_file("newfile");
148 xstat_mtime_dir(&st
);
149 if (!match_stat_data(&base
, &st
)) {
152 fprintf_ln(stderr
,_("directory stat info does not "
153 "change after adding a new file"));
156 fill_stat_data(&base
, &st
);
161 xstat_mtime_dir(&st
);
162 if (!match_stat_data(&base
, &st
)) {
165 fprintf_ln(stderr
, _("directory stat info does not change "
166 "after adding a new directory"));
169 fill_stat_data(&base
, &st
);
173 write_or_die(fd
, "data", 4);
175 xstat_mtime_dir(&st
);
176 if (match_stat_data(&base
, &st
)) {
178 fprintf_ln(stderr
, _("directory stat info changes "
179 "after updating a file"));
185 close(create_file("new-dir/new"));
186 xstat_mtime_dir(&st
);
187 if (match_stat_data(&base
, &st
)) {
189 fprintf_ln(stderr
, _("directory stat info changes after "
190 "adding a file inside subdirectory"));
197 xstat_mtime_dir(&st
);
198 if (!match_stat_data(&base
, &st
)) {
200 fprintf_ln(stderr
, _("directory stat info does not "
201 "change after deleting a file"));
204 fill_stat_data(&base
, &st
);
208 xunlink("new-dir/new");
210 xstat_mtime_dir(&st
);
211 if (!match_stat_data(&base
, &st
)) {
213 fprintf_ln(stderr
, _("directory stat info does not "
214 "change after deleting a directory"));
218 if (rmdir(mtime_dir
.buf
))
219 die_errno(_("failed to delete directory %s"), mtime_dir
.buf
);
220 fprintf_ln(stderr
, _(" OK"));
224 strbuf_release(&mtime_dir
);
228 static int mark_ce_flags(const char *path
, int flag
, int mark
)
230 int namelen
= strlen(path
);
231 int pos
= cache_name_pos(path
, namelen
);
233 mark_fsmonitor_invalid(&the_index
, active_cache
[pos
]);
235 active_cache
[pos
]->ce_flags
|= flag
;
237 active_cache
[pos
]->ce_flags
&= ~flag
;
238 active_cache
[pos
]->ce_flags
|= CE_UPDATE_IN_BASE
;
239 cache_tree_invalidate_path(&the_index
, path
);
240 active_cache_changed
|= CE_ENTRY_CHANGED
;
246 static int remove_one_path(const char *path
)
249 return error("%s: does not exist and --remove not passed", path
);
250 if (remove_file_from_cache(path
))
251 return error("%s: cannot remove from the index", path
);
256 * Handle a path that couldn't be lstat'ed. It's either:
257 * - missing file (ENOENT or ENOTDIR). That's ok if we're
258 * supposed to be removing it and the removal actually
260 * - permission error. That's never ok.
262 static int process_lstat_error(const char *path
, int err
)
264 if (is_missing_file_error(err
))
265 return remove_one_path(path
);
266 return error("lstat(\"%s\"): %s", path
, strerror(err
));
269 static int add_one_path(const struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
272 struct cache_entry
*ce
;
274 /* Was the old index entry already up-to-date? */
275 if (old
&& !ce_stage(old
) && !ce_match_stat(old
, st
, 0))
278 size
= cache_entry_size(len
);
279 ce
= xcalloc(1, size
);
280 memcpy(ce
->name
, path
, len
);
281 ce
->ce_flags
= create_ce_flags(0);
282 ce
->ce_namelen
= len
;
283 fill_stat_cache_info(ce
, st
);
284 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
286 if (index_path(&ce
->oid
, path
, st
,
287 info_only
? 0 : HASH_WRITE_OBJECT
)) {
291 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
292 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
293 if (add_cache_entry(ce
, option
)) {
295 return error("%s: cannot add to the index - missing --add option?", path
);
301 * Handle a path that was a directory. Four cases:
303 * - it's already a gitlink in the index, and we keep it that
304 * way, and update it if we can (if we cannot find the HEAD,
305 * we're going to keep it unchanged in the index!)
307 * - it's a *file* in the index, in which case it should be
308 * removed as a file if removal is allowed, since it doesn't
309 * exist as such any more. If removal isn't allowed, it's
312 * (NOTE! This is old and arguably fairly strange behaviour.
313 * We might want to make this an error unconditionally, and
314 * use "--force-remove" if you actually want to force removal).
316 * - it used to exist as a subdirectory (ie multiple files with
317 * this particular prefix) in the index, in which case it's wrong
318 * to try to update it as a directory.
320 * - it doesn't exist at all in the index, but it is a valid
321 * git directory, and it should be *added* as a gitlink.
323 static int process_directory(const char *path
, int len
, struct stat
*st
)
325 struct object_id oid
;
326 int pos
= cache_name_pos(path
, len
);
328 /* Exact match: file or existing gitlink */
330 const struct cache_entry
*ce
= active_cache
[pos
];
331 if (S_ISGITLINK(ce
->ce_mode
)) {
333 /* Do nothing to the index if there is no HEAD! */
334 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
337 return add_one_path(ce
, path
, len
, st
);
339 /* Should this be an unconditional error? */
340 return remove_one_path(path
);
343 /* Inexact match: is there perhaps a subdirectory match? */
345 while (pos
< active_nr
) {
346 const struct cache_entry
*ce
= active_cache
[pos
++];
348 if (strncmp(ce
->name
, path
, len
))
350 if (ce
->name
[len
] > '/')
352 if (ce
->name
[len
] < '/')
355 /* Subdirectory match - error out */
356 return error("%s: is a directory - add individual files instead", path
);
359 /* No match - should we add it as a gitlink? */
360 if (!resolve_gitlink_ref(path
, "HEAD", &oid
))
361 return add_one_path(NULL
, path
, len
, st
);
364 return error("%s: is a directory - add files inside instead", path
);
367 static int process_path(const char *path
)
371 const struct cache_entry
*ce
;
374 if (has_symlink_leading_path(path
, len
))
375 return error("'%s' is beyond a symbolic link", path
);
377 pos
= cache_name_pos(path
, len
);
378 ce
= pos
< 0 ? NULL
: active_cache
[pos
];
379 if (ce
&& ce_skip_worktree(ce
)) {
381 * working directory version is assumed "good"
382 * so updating it does not make sense.
383 * On the other hand, removing it from index should work
385 if (allow_remove
&& remove_file_from_cache(path
))
386 return error("%s: cannot remove from the index", path
);
391 * First things first: get the stat information, to decide
392 * what to do about the pathname!
394 if (lstat(path
, &st
) < 0)
395 return process_lstat_error(path
, errno
);
397 if (S_ISDIR(st
.st_mode
))
398 return process_directory(path
, len
, &st
);
400 return add_one_path(ce
, path
, len
, &st
);
403 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
404 const char *path
, int stage
)
406 int size
, len
, option
;
407 struct cache_entry
*ce
;
409 if (!verify_path(path
))
410 return error("Invalid path '%s'", path
);
413 size
= cache_entry_size(len
);
414 ce
= xcalloc(1, size
);
416 oidcpy(&ce
->oid
, oid
);
417 memcpy(ce
->name
, path
, len
);
418 ce
->ce_flags
= create_ce_flags(stage
);
419 ce
->ce_namelen
= len
;
420 ce
->ce_mode
= create_ce_mode(mode
);
421 if (assume_unchanged
)
422 ce
->ce_flags
|= CE_VALID
;
423 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
424 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
425 if (add_cache_entry(ce
, option
))
426 return error("%s: cannot add to the index - missing --add option?",
428 report("add '%s'", path
);
432 static void chmod_path(char flip
, const char *path
)
435 struct cache_entry
*ce
;
437 pos
= cache_name_pos(path
, strlen(path
));
440 ce
= active_cache
[pos
];
441 if (chmod_cache_entry(ce
, flip
) < 0)
444 report("chmod %cx '%s'", flip
, path
);
447 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
450 static void update_one(const char *path
)
452 if (!verify_path(path
)) {
453 fprintf(stderr
, "Ignoring path %s\n", path
);
456 if (mark_valid_only
) {
457 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
458 die("Unable to mark file %s", path
);
461 if (mark_skip_worktree_only
) {
462 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
463 die("Unable to mark file %s", path
);
466 if (mark_fsmonitor_only
) {
467 if (mark_ce_flags(path
, CE_FSMONITOR_VALID
, mark_fsmonitor_only
== MARK_FLAG
))
468 die("Unable to mark file %s", path
);
473 if (remove_file_from_cache(path
))
474 die("git update-index: unable to remove %s", path
);
475 report("remove '%s'", path
);
478 if (process_path(path
))
479 die("Unable to process path %s", path
);
480 report("add '%s'", path
);
483 static void read_index_info(int nul_term_line
)
485 struct strbuf buf
= STRBUF_INIT
;
486 struct strbuf uq
= STRBUF_INIT
;
487 strbuf_getline_fn getline_fn
;
489 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
490 while (getline_fn(&buf
, stdin
) != EOF
) {
493 struct object_id oid
;
498 /* This reads lines formatted in one of three formats:
500 * (1) mode SP sha1 TAB path
501 * The first format is what "git apply --index-info"
502 * reports, and used to reconstruct a partial tree
503 * that is used for phony merge base tree when falling
504 * back on 3-way merge.
506 * (2) mode SP type SP sha1 TAB path
507 * The second format is to stuff "git ls-tree" output
508 * into the index file.
510 * (3) mode SP sha1 SP stage TAB path
511 * This format is to put higher order stages into the
512 * index file and matches "git ls-files --stage" output.
515 ul
= strtoul(buf
.buf
, &ptr
, 8);
516 if (ptr
== buf
.buf
|| *ptr
!= ' '
517 || errno
|| (unsigned int) ul
!= ul
)
521 tab
= strchr(ptr
, '\t');
522 if (!tab
|| tab
- ptr
< GIT_SHA1_HEXSZ
+ 1)
525 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
526 stage
= tab
[-1] - '0';
527 ptr
= tab
+ 1; /* point at the head of path */
528 tab
= tab
- 2; /* point at tail of sha1 */
532 ptr
= tab
+ 1; /* point at the head of path */
535 if (get_oid_hex(tab
- GIT_SHA1_HEXSZ
, &oid
) ||
536 tab
[-(GIT_SHA1_HEXSZ
+ 1)] != ' ')
540 if (!nul_term_line
&& path_name
[0] == '"') {
542 if (unquote_c_style(&uq
, path_name
, NULL
)) {
543 die("git update-index: bad quoting of path name");
548 if (!verify_path(path_name
)) {
549 fprintf(stderr
, "Ignoring path %s\n", path_name
);
554 /* mode == 0 means there is no such path -- remove */
555 if (remove_file_from_cache(path_name
))
556 die("git update-index: unable to remove %s",
560 /* mode ' ' sha1 '\t' name
561 * ptr[-1] points at tab,
562 * ptr[-41] is at the beginning of sha1
564 ptr
[-(GIT_SHA1_HEXSZ
+ 2)] = ptr
[-1] = 0;
565 if (add_cacheinfo(mode
, &oid
, path_name
, stage
))
566 die("git update-index: unable to update %s",
572 die("malformed index info %s", buf
.buf
);
574 strbuf_release(&buf
);
578 static const char * const update_index_usage
[] = {
579 N_("git update-index [<options>] [--] [<file>...]"),
583 static struct object_id head_oid
;
584 static struct object_id merge_head_oid
;
586 static struct cache_entry
*read_one_ent(const char *which
,
587 struct object_id
*ent
, const char *path
,
588 int namelen
, int stage
)
591 struct object_id oid
;
593 struct cache_entry
*ce
;
595 if (get_tree_entry(ent
->hash
, path
, oid
.hash
, &mode
)) {
597 error("%s: not in %s branch.", path
, which
);
600 if (mode
== S_IFDIR
) {
602 error("%s: not a blob in %s branch.", path
, which
);
605 size
= cache_entry_size(namelen
);
606 ce
= xcalloc(1, size
);
608 oidcpy(&ce
->oid
, &oid
);
609 memcpy(ce
->name
, path
, namelen
);
610 ce
->ce_flags
= create_ce_flags(stage
);
611 ce
->ce_namelen
= namelen
;
612 ce
->ce_mode
= create_ce_mode(mode
);
616 static int unresolve_one(const char *path
)
618 int namelen
= strlen(path
);
621 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
623 /* See if there is such entry in the index. */
624 pos
= cache_name_pos(path
, namelen
);
627 pos
= unmerge_cache_entry_at(pos
);
628 if (pos
< active_nr
) {
629 const struct cache_entry
*ce
= active_cache
[pos
];
631 ce_namelen(ce
) == namelen
&&
632 !memcmp(ce
->name
, path
, namelen
))
635 /* no resolve-undo information; fall back */
637 /* If there isn't, either it is unmerged, or
638 * resolved as "removed" by mistake. We do not
639 * want to do anything in the former case.
642 if (pos
< active_nr
) {
643 const struct cache_entry
*ce
= active_cache
[pos
];
644 if (ce_namelen(ce
) == namelen
&&
645 !memcmp(ce
->name
, path
, namelen
)) {
647 "%s: skipping still unmerged path.\n",
654 /* Grab blobs from given path from HEAD and MERGE_HEAD,
655 * stuff HEAD version in stage #2,
656 * stuff MERGE_HEAD version in stage #3.
658 ce_2
= read_one_ent("our", &head_oid
, path
, namelen
, 2);
659 ce_3
= read_one_ent("their", &merge_head_oid
, path
, namelen
, 3);
661 if (!ce_2
|| !ce_3
) {
665 if (!oidcmp(&ce_2
->oid
, &ce_3
->oid
) &&
666 ce_2
->ce_mode
== ce_3
->ce_mode
) {
667 fprintf(stderr
, "%s: identical in both, skipping.\n",
672 remove_file_from_cache(path
);
673 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
674 error("%s: cannot add our version to the index.", path
);
678 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
680 error("%s: cannot add their version to the index.", path
);
688 static void read_head_pointers(void)
690 if (read_ref("HEAD", &head_oid
))
691 die("No HEAD -- no initial commit yet?");
692 if (read_ref("MERGE_HEAD", &merge_head_oid
)) {
693 fprintf(stderr
, "Not in the middle of a merge.\n");
698 static int do_unresolve(int ac
, const char **av
,
699 const char *prefix
, int prefix_length
)
704 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
705 * are not doing a merge, so exit with success status.
707 read_head_pointers();
709 for (i
= 1; i
< ac
; i
++) {
710 const char *arg
= av
[i
];
711 char *p
= prefix_path(prefix
, prefix_length
, arg
);
712 err
|= unresolve_one(p
);
718 static int do_reupdate(int ac
, const char **av
,
719 const char *prefix
, int prefix_length
)
721 /* Read HEAD and run update-index on paths that are
722 * merged and already different between index and HEAD.
726 struct pathspec pathspec
;
728 parse_pathspec(&pathspec
, 0,
732 if (read_ref("HEAD", &head_oid
))
733 /* If there is no HEAD, that means it is an initial
734 * commit. Update everything in the index.
738 for (pos
= 0; pos
< active_nr
; pos
++) {
739 const struct cache_entry
*ce
= active_cache
[pos
];
740 struct cache_entry
*old
= NULL
;
744 if (ce_stage(ce
) || !ce_path_match(ce
, &pathspec
, NULL
))
747 old
= read_one_ent(NULL
, &head_oid
,
748 ce
->name
, ce_namelen(ce
), 0);
749 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
750 !oidcmp(&ce
->oid
, &old
->oid
)) {
752 continue; /* unchanged */
754 /* Be careful. The working tree may not have the
755 * path anymore, in which case, under 'allow_remove',
756 * or worse yet 'allow_replace', active_nr may decrease.
759 path
= xstrdup(ce
->name
);
763 if (save_nr
!= active_nr
)
766 clear_pathspec(&pathspec
);
770 struct refresh_params
{
775 static int refresh(struct refresh_params
*o
, unsigned int flag
)
778 read_cache_preload(NULL
);
779 *o
->has_errors
|= refresh_cache(o
->flags
| flag
);
783 static int refresh_callback(const struct option
*opt
,
784 const char *arg
, int unset
)
786 return refresh(opt
->value
, 0);
789 static int really_refresh_callback(const struct option
*opt
,
790 const char *arg
, int unset
)
792 return refresh(opt
->value
, REFRESH_REALLY
);
795 static int chmod_callback(const struct option
*opt
,
796 const char *arg
, int unset
)
798 char *flip
= opt
->value
;
799 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
800 return error("option 'chmod' expects \"+x\" or \"-x\"");
805 static int resolve_undo_clear_callback(const struct option
*opt
,
806 const char *arg
, int unset
)
808 resolve_undo_clear();
812 static int parse_new_style_cacheinfo(const char *arg
,
814 struct object_id
*oid
,
824 ul
= strtoul(arg
, &endp
, 8);
825 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
826 return -1; /* not a new-style cacheinfo */
829 if (get_oid_hex(endp
, oid
) || endp
[GIT_SHA1_HEXSZ
] != ',')
831 *path
= endp
+ GIT_SHA1_HEXSZ
+ 1;
835 static int cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
836 const struct option
*opt
, int unset
)
838 struct object_id oid
;
842 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, &oid
, &path
)) {
843 if (add_cacheinfo(mode
, &oid
, path
, 0))
844 die("git update-index: --cacheinfo cannot add %s", path
);
850 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
851 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
852 get_oid_hex(*++ctx
->argv
, &oid
) ||
853 add_cacheinfo(mode
, &oid
, *++ctx
->argv
, 0))
854 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
859 static int stdin_cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
860 const struct option
*opt
, int unset
)
862 int *nul_term_line
= opt
->value
;
865 return error("option '%s' must be the last argument", opt
->long_name
);
866 allow_add
= allow_replace
= allow_remove
= 1;
867 read_index_info(*nul_term_line
);
871 static int stdin_callback(struct parse_opt_ctx_t
*ctx
,
872 const struct option
*opt
, int unset
)
874 int *read_from_stdin
= opt
->value
;
877 return error("option '%s' must be the last argument", opt
->long_name
);
878 *read_from_stdin
= 1;
882 static int unresolve_callback(struct parse_opt_ctx_t
*ctx
,
883 const struct option
*opt
, int flags
)
885 int *has_errors
= opt
->value
;
886 const char *prefix
= startup_info
->prefix
;
888 /* consume remaining arguments. */
889 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
890 prefix
, prefix
? strlen(prefix
) : 0);
892 active_cache_changed
= 0;
894 ctx
->argv
+= ctx
->argc
- 1;
899 static int reupdate_callback(struct parse_opt_ctx_t
*ctx
,
900 const struct option
*opt
, int flags
)
902 int *has_errors
= opt
->value
;
903 const char *prefix
= startup_info
->prefix
;
905 /* consume remaining arguments. */
907 *has_errors
= do_reupdate(ctx
->argc
, ctx
->argv
,
908 prefix
, prefix
? strlen(prefix
) : 0);
910 active_cache_changed
= 0;
912 ctx
->argv
+= ctx
->argc
- 1;
917 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
919 int newfd
, entries
, has_errors
= 0, nul_term_line
= 0;
920 enum uc_mode untracked_cache
= UC_UNSPECIFIED
;
921 int read_from_stdin
= 0;
922 int prefix_length
= prefix
? strlen(prefix
) : 0;
923 int preferred_index_format
= 0;
924 char set_executable_bit
= 0;
925 struct refresh_params refresh_args
= {0, &has_errors
};
927 int split_index
= -1;
930 struct lock_file lock_file
= LOCK_INIT
;
931 struct parse_opt_ctx_t ctx
;
932 strbuf_getline_fn getline_fn
;
933 int parseopt_state
= PARSE_OPT_UNKNOWN
;
934 struct option options
[] = {
935 OPT_BIT('q', NULL
, &refresh_args
.flags
,
936 N_("continue refresh even when index needs update"),
938 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
939 N_("refresh: ignore submodules"),
940 REFRESH_IGNORE_SUBMODULES
),
941 OPT_SET_INT(0, "add", &allow_add
,
942 N_("do not ignore new files"), 1),
943 OPT_SET_INT(0, "replace", &allow_replace
,
944 N_("let files replace directories and vice-versa"), 1),
945 OPT_SET_INT(0, "remove", &allow_remove
,
946 N_("notice files missing from worktree"), 1),
947 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
948 N_("refresh even if index contains unmerged entries"),
950 {OPTION_CALLBACK
, 0, "refresh", &refresh_args
, NULL
,
951 N_("refresh stat information"),
952 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
954 {OPTION_CALLBACK
, 0, "really-refresh", &refresh_args
, NULL
,
955 N_("like --refresh, but ignore assume-unchanged setting"),
956 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
957 really_refresh_callback
},
958 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
959 N_("<mode>,<object>,<path>"),
960 N_("add the specified entry to the index"),
961 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
962 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
963 (parse_opt_cb
*) cacheinfo_callback
},
964 {OPTION_CALLBACK
, 0, "chmod", &set_executable_bit
, N_("(+/-)x"),
965 N_("override the executable bit of the listed files"),
966 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
968 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
969 N_("mark files as \"not changing\""),
970 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
971 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
972 N_("clear assumed-unchanged bit"),
973 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
974 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
975 N_("mark files as \"index-only\""),
976 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
977 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
978 N_("clear skip-worktree bit"),
979 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
980 OPT_SET_INT(0, "info-only", &info_only
,
981 N_("add to index only; do not add content to object database"), 1),
982 OPT_SET_INT(0, "force-remove", &force_remove
,
983 N_("remove named paths even if present in worktree"), 1),
984 OPT_BOOL('z', NULL
, &nul_term_line
,
985 N_("with --stdin: input lines are terminated by null bytes")),
986 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
987 N_("read list of paths to be updated from standard input"),
988 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
989 (parse_opt_cb
*) stdin_callback
},
990 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &nul_term_line
, NULL
,
991 N_("add entries from standard input to the index"),
992 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
993 (parse_opt_cb
*) stdin_cacheinfo_callback
},
994 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
995 N_("repopulate stages #2 and #3 for the listed paths"),
996 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
997 (parse_opt_cb
*) unresolve_callback
},
998 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
999 N_("only update entries that differ from HEAD"),
1000 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1001 (parse_opt_cb
*) reupdate_callback
},
1002 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
1003 N_("ignore files missing from worktree"),
1004 REFRESH_IGNORE_MISSING
),
1005 OPT_SET_INT(0, "verbose", &verbose
,
1006 N_("report actions to standard output"), 1),
1007 {OPTION_CALLBACK
, 0, "clear-resolve-undo", NULL
, NULL
,
1008 N_("(for porcelains) forget saved unresolved conflicts"),
1009 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1010 resolve_undo_clear_callback
},
1011 OPT_INTEGER(0, "index-version", &preferred_index_format
,
1012 N_("write index in this format")),
1013 OPT_BOOL(0, "split-index", &split_index
,
1014 N_("enable or disable split index")),
1015 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1016 N_("enable/disable untracked cache")),
1017 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache
,
1018 N_("test if the filesystem supports untracked cache"), UC_TEST
),
1019 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1020 N_("enable untracked cache without testing the filesystem"), UC_FORCE
),
1021 OPT_SET_INT(0, "force-write-index", &force_write
,
1022 N_("write out the index even if is not flagged as changed"), 1),
1023 OPT_BOOL(0, "fsmonitor", &fsmonitor
,
1024 N_("enable or disable file system monitor")),
1025 {OPTION_SET_INT
, 0, "fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1026 N_("mark files as fsmonitor valid"),
1027 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1028 {OPTION_SET_INT
, 0, "no-fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1029 N_("clear fsmonitor valid bit"),
1030 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1034 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1035 usage_with_options(update_index_usage
, options
);
1037 git_config(git_default_config
, NULL
);
1039 /* we will diagnose later if it turns out that we need to update it */
1040 newfd
= hold_locked_index(&lock_file
, 0);
1044 entries
= read_cache();
1046 die("cache corrupted");
1049 * Custom copy of parse_options() because we want to handle
1050 * filename arguments as they come.
1052 parse_options_start(&ctx
, argc
, argv
, prefix
,
1053 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
1055 if (parseopt_state
!= PARSE_OPT_DONE
)
1056 parseopt_state
= parse_options_step(&ctx
, options
,
1057 update_index_usage
);
1060 switch (parseopt_state
) {
1061 case PARSE_OPT_HELP
:
1063 case PARSE_OPT_NON_OPTION
:
1064 case PARSE_OPT_DONE
:
1066 const char *path
= ctx
.argv
[0];
1070 p
= prefix_path(prefix
, prefix_length
, path
);
1072 if (set_executable_bit
)
1073 chmod_path(set_executable_bit
, p
);
1079 case PARSE_OPT_UNKNOWN
:
1080 if (ctx
.argv
[0][1] == '-')
1081 error("unknown option '%s'", ctx
.argv
[0] + 2);
1083 error("unknown switch '%c'", *ctx
.opt
);
1084 usage_with_options(update_index_usage
, options
);
1087 argc
= parse_options_end(&ctx
);
1089 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
1090 if (preferred_index_format
) {
1091 if (preferred_index_format
< INDEX_FORMAT_LB
||
1092 INDEX_FORMAT_UB
< preferred_index_format
)
1093 die("index-version %d not in range: %d..%d",
1094 preferred_index_format
,
1095 INDEX_FORMAT_LB
, INDEX_FORMAT_UB
);
1097 if (the_index
.version
!= preferred_index_format
)
1098 active_cache_changed
|= SOMETHING_CHANGED
;
1099 the_index
.version
= preferred_index_format
;
1102 if (read_from_stdin
) {
1103 struct strbuf buf
= STRBUF_INIT
;
1104 struct strbuf unquoted
= STRBUF_INIT
;
1107 while (getline_fn(&buf
, stdin
) != EOF
) {
1109 if (!nul_term_line
&& buf
.buf
[0] == '"') {
1110 strbuf_reset(&unquoted
);
1111 if (unquote_c_style(&unquoted
, buf
.buf
, NULL
))
1112 die("line is badly quoted");
1113 strbuf_swap(&buf
, &unquoted
);
1115 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
1117 if (set_executable_bit
)
1118 chmod_path(set_executable_bit
, p
);
1121 strbuf_release(&unquoted
);
1122 strbuf_release(&buf
);
1125 if (split_index
> 0) {
1126 if (git_config_get_split_index() == 0)
1127 warning(_("core.splitIndex is set to false; "
1128 "remove or change it, if you really want to "
1129 "enable split index"));
1130 if (the_index
.split_index
)
1131 the_index
.cache_changed
|= SPLIT_INDEX_ORDERED
;
1133 add_split_index(&the_index
);
1134 } else if (!split_index
) {
1135 if (git_config_get_split_index() == 1)
1136 warning(_("core.splitIndex is set to true; "
1137 "remove or change it, if you really want to "
1138 "disable split index"));
1139 remove_split_index(&the_index
);
1142 switch (untracked_cache
) {
1143 case UC_UNSPECIFIED
:
1146 if (git_config_get_untracked_cache() == 1)
1147 warning(_("core.untrackedCache is set to true; "
1148 "remove or change it, if you really want to "
1149 "disable the untracked cache"));
1150 remove_untracked_cache(&the_index
);
1151 report(_("Untracked cache disabled"));
1155 return !test_if_untracked_cache_is_supported();
1158 if (git_config_get_untracked_cache() == 0)
1159 warning(_("core.untrackedCache is set to false; "
1160 "remove or change it, if you really want to "
1161 "enable the untracked cache"));
1162 add_untracked_cache(&the_index
);
1163 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1166 die("BUG: bad untracked_cache value: %d", untracked_cache
);
1169 if (fsmonitor
> 0) {
1170 if (git_config_get_fsmonitor() == 0)
1171 warning(_("core.fsmonitor is unset; "
1172 "set it if you really want to "
1173 "enable fsmonitor"));
1174 add_fsmonitor(&the_index
);
1175 report(_("fsmonitor enabled"));
1176 } else if (!fsmonitor
) {
1177 if (git_config_get_fsmonitor() == 1)
1178 warning(_("core.fsmonitor is set; "
1179 "remove it if you really want to "
1180 "disable fsmonitor"));
1181 remove_fsmonitor(&the_index
);
1182 report(_("fsmonitor disabled"));
1185 if (active_cache_changed
|| force_write
) {
1187 if (refresh_args
.flags
& REFRESH_QUIET
)
1189 unable_to_lock_die(get_index_file(), lock_error
);
1191 if (write_locked_index(&the_index
, &lock_file
, COMMIT_LOCK
))
1192 die("Unable to write new index file");
1195 rollback_lock_file(&lock_file
);
1197 return has_errors
? 1 : 0;