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
))
294 return error("%s: cannot add to the index - missing --add option?", path
);
299 * Handle a path that was a directory. Four cases:
301 * - it's already a gitlink in the index, and we keep it that
302 * way, and update it if we can (if we cannot find the HEAD,
303 * we're going to keep it unchanged in the index!)
305 * - it's a *file* in the index, in which case it should be
306 * removed as a file if removal is allowed, since it doesn't
307 * exist as such any more. If removal isn't allowed, it's
310 * (NOTE! This is old and arguably fairly strange behaviour.
311 * We might want to make this an error unconditionally, and
312 * use "--force-remove" if you actually want to force removal).
314 * - it used to exist as a subdirectory (ie multiple files with
315 * this particular prefix) in the index, in which case it's wrong
316 * to try to update it as a directory.
318 * - it doesn't exist at all in the index, but it is a valid
319 * git directory, and it should be *added* as a gitlink.
321 static int process_directory(const char *path
, int len
, struct stat
*st
)
323 struct object_id oid
;
324 int pos
= cache_name_pos(path
, len
);
326 /* Exact match: file or existing gitlink */
328 const struct cache_entry
*ce
= active_cache
[pos
];
329 if (S_ISGITLINK(ce
->ce_mode
)) {
331 /* Do nothing to the index if there is no HEAD! */
332 if (resolve_gitlink_ref(path
, "HEAD", oid
.hash
) < 0)
335 return add_one_path(ce
, path
, len
, st
);
337 /* Should this be an unconditional error? */
338 return remove_one_path(path
);
341 /* Inexact match: is there perhaps a subdirectory match? */
343 while (pos
< active_nr
) {
344 const struct cache_entry
*ce
= active_cache
[pos
++];
346 if (strncmp(ce
->name
, path
, len
))
348 if (ce
->name
[len
] > '/')
350 if (ce
->name
[len
] < '/')
353 /* Subdirectory match - error out */
354 return error("%s: is a directory - add individual files instead", path
);
357 /* No match - should we add it as a gitlink? */
358 if (!resolve_gitlink_ref(path
, "HEAD", oid
.hash
))
359 return add_one_path(NULL
, path
, len
, st
);
362 return error("%s: is a directory - add files inside instead", path
);
365 static int process_path(const char *path
)
369 const struct cache_entry
*ce
;
372 if (has_symlink_leading_path(path
, len
))
373 return error("'%s' is beyond a symbolic link", path
);
375 pos
= cache_name_pos(path
, len
);
376 ce
= pos
< 0 ? NULL
: active_cache
[pos
];
377 if (ce
&& ce_skip_worktree(ce
)) {
379 * working directory version is assumed "good"
380 * so updating it does not make sense.
381 * On the other hand, removing it from index should work
383 if (allow_remove
&& remove_file_from_cache(path
))
384 return error("%s: cannot remove from the index", path
);
389 * First things first: get the stat information, to decide
390 * what to do about the pathname!
392 if (lstat(path
, &st
) < 0)
393 return process_lstat_error(path
, errno
);
395 if (S_ISDIR(st
.st_mode
))
396 return process_directory(path
, len
, &st
);
398 return add_one_path(ce
, path
, len
, &st
);
401 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
402 const char *path
, int stage
)
404 int size
, len
, option
;
405 struct cache_entry
*ce
;
407 if (!verify_path(path
))
408 return error("Invalid path '%s'", path
);
411 size
= cache_entry_size(len
);
412 ce
= xcalloc(1, size
);
414 oidcpy(&ce
->oid
, oid
);
415 memcpy(ce
->name
, path
, len
);
416 ce
->ce_flags
= create_ce_flags(stage
);
417 ce
->ce_namelen
= len
;
418 ce
->ce_mode
= create_ce_mode(mode
);
419 if (assume_unchanged
)
420 ce
->ce_flags
|= CE_VALID
;
421 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
422 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
423 if (add_cache_entry(ce
, option
))
424 return error("%s: cannot add to the index - missing --add option?",
426 report("add '%s'", path
);
430 static void chmod_path(char flip
, const char *path
)
433 struct cache_entry
*ce
;
435 pos
= cache_name_pos(path
, strlen(path
));
438 ce
= active_cache
[pos
];
439 if (chmod_cache_entry(ce
, flip
) < 0)
442 report("chmod %cx '%s'", flip
, path
);
445 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
448 static void update_one(const char *path
)
450 if (!verify_path(path
)) {
451 fprintf(stderr
, "Ignoring path %s\n", path
);
454 if (mark_valid_only
) {
455 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
456 die("Unable to mark file %s", path
);
459 if (mark_skip_worktree_only
) {
460 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
461 die("Unable to mark file %s", path
);
464 if (mark_fsmonitor_only
) {
465 if (mark_ce_flags(path
, CE_FSMONITOR_VALID
, mark_fsmonitor_only
== MARK_FLAG
))
466 die("Unable to mark file %s", path
);
471 if (remove_file_from_cache(path
))
472 die("git update-index: unable to remove %s", path
);
473 report("remove '%s'", path
);
476 if (process_path(path
))
477 die("Unable to process path %s", path
);
478 report("add '%s'", path
);
481 static void read_index_info(int nul_term_line
)
483 struct strbuf buf
= STRBUF_INIT
;
484 struct strbuf uq
= STRBUF_INIT
;
485 strbuf_getline_fn getline_fn
;
487 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
488 while (getline_fn(&buf
, stdin
) != EOF
) {
491 struct object_id oid
;
496 /* This reads lines formatted in one of three formats:
498 * (1) mode SP sha1 TAB path
499 * The first format is what "git apply --index-info"
500 * reports, and used to reconstruct a partial tree
501 * that is used for phony merge base tree when falling
502 * back on 3-way merge.
504 * (2) mode SP type SP sha1 TAB path
505 * The second format is to stuff "git ls-tree" output
506 * into the index file.
508 * (3) mode SP sha1 SP stage TAB path
509 * This format is to put higher order stages into the
510 * index file and matches "git ls-files --stage" output.
513 ul
= strtoul(buf
.buf
, &ptr
, 8);
514 if (ptr
== buf
.buf
|| *ptr
!= ' '
515 || errno
|| (unsigned int) ul
!= ul
)
519 tab
= strchr(ptr
, '\t');
520 if (!tab
|| tab
- ptr
< GIT_SHA1_HEXSZ
+ 1)
523 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
524 stage
= tab
[-1] - '0';
525 ptr
= tab
+ 1; /* point at the head of path */
526 tab
= tab
- 2; /* point at tail of sha1 */
530 ptr
= tab
+ 1; /* point at the head of path */
533 if (get_oid_hex(tab
- GIT_SHA1_HEXSZ
, &oid
) ||
534 tab
[-(GIT_SHA1_HEXSZ
+ 1)] != ' ')
538 if (!nul_term_line
&& path_name
[0] == '"') {
540 if (unquote_c_style(&uq
, path_name
, NULL
)) {
541 die("git update-index: bad quoting of path name");
546 if (!verify_path(path_name
)) {
547 fprintf(stderr
, "Ignoring path %s\n", path_name
);
552 /* mode == 0 means there is no such path -- remove */
553 if (remove_file_from_cache(path_name
))
554 die("git update-index: unable to remove %s",
558 /* mode ' ' sha1 '\t' name
559 * ptr[-1] points at tab,
560 * ptr[-41] is at the beginning of sha1
562 ptr
[-(GIT_SHA1_HEXSZ
+ 2)] = ptr
[-1] = 0;
563 if (add_cacheinfo(mode
, &oid
, path_name
, stage
))
564 die("git update-index: unable to update %s",
570 die("malformed index info %s", buf
.buf
);
572 strbuf_release(&buf
);
576 static const char * const update_index_usage
[] = {
577 N_("git update-index [<options>] [--] [<file>...]"),
581 static struct object_id head_oid
;
582 static struct object_id merge_head_oid
;
584 static struct cache_entry
*read_one_ent(const char *which
,
585 struct object_id
*ent
, const char *path
,
586 int namelen
, int stage
)
589 struct object_id oid
;
591 struct cache_entry
*ce
;
593 if (get_tree_entry(ent
->hash
, path
, oid
.hash
, &mode
)) {
595 error("%s: not in %s branch.", path
, which
);
598 if (mode
== S_IFDIR
) {
600 error("%s: not a blob in %s branch.", path
, which
);
603 size
= cache_entry_size(namelen
);
604 ce
= xcalloc(1, size
);
606 oidcpy(&ce
->oid
, &oid
);
607 memcpy(ce
->name
, path
, namelen
);
608 ce
->ce_flags
= create_ce_flags(stage
);
609 ce
->ce_namelen
= namelen
;
610 ce
->ce_mode
= create_ce_mode(mode
);
614 static int unresolve_one(const char *path
)
616 int namelen
= strlen(path
);
619 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
621 /* See if there is such entry in the index. */
622 pos
= cache_name_pos(path
, namelen
);
625 pos
= unmerge_cache_entry_at(pos
);
626 if (pos
< active_nr
) {
627 const struct cache_entry
*ce
= active_cache
[pos
];
629 ce_namelen(ce
) == namelen
&&
630 !memcmp(ce
->name
, path
, namelen
))
633 /* no resolve-undo information; fall back */
635 /* If there isn't, either it is unmerged, or
636 * resolved as "removed" by mistake. We do not
637 * want to do anything in the former case.
640 if (pos
< active_nr
) {
641 const struct cache_entry
*ce
= active_cache
[pos
];
642 if (ce_namelen(ce
) == namelen
&&
643 !memcmp(ce
->name
, path
, namelen
)) {
645 "%s: skipping still unmerged path.\n",
652 /* Grab blobs from given path from HEAD and MERGE_HEAD,
653 * stuff HEAD version in stage #2,
654 * stuff MERGE_HEAD version in stage #3.
656 ce_2
= read_one_ent("our", &head_oid
, path
, namelen
, 2);
657 ce_3
= read_one_ent("their", &merge_head_oid
, path
, namelen
, 3);
659 if (!ce_2
|| !ce_3
) {
663 if (!oidcmp(&ce_2
->oid
, &ce_3
->oid
) &&
664 ce_2
->ce_mode
== ce_3
->ce_mode
) {
665 fprintf(stderr
, "%s: identical in both, skipping.\n",
670 remove_file_from_cache(path
);
671 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
672 error("%s: cannot add our version to the index.", path
);
676 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
678 error("%s: cannot add their version to the index.", path
);
686 static void read_head_pointers(void)
688 if (read_ref("HEAD", head_oid
.hash
))
689 die("No HEAD -- no initial commit yet?");
690 if (read_ref("MERGE_HEAD", merge_head_oid
.hash
)) {
691 fprintf(stderr
, "Not in the middle of a merge.\n");
696 static int do_unresolve(int ac
, const char **av
,
697 const char *prefix
, int prefix_length
)
702 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
703 * are not doing a merge, so exit with success status.
705 read_head_pointers();
707 for (i
= 1; i
< ac
; i
++) {
708 const char *arg
= av
[i
];
709 char *p
= prefix_path(prefix
, prefix_length
, arg
);
710 err
|= unresolve_one(p
);
716 static int do_reupdate(int ac
, const char **av
,
717 const char *prefix
, int prefix_length
)
719 /* Read HEAD and run update-index on paths that are
720 * merged and already different between index and HEAD.
724 struct pathspec pathspec
;
726 parse_pathspec(&pathspec
, 0,
730 if (read_ref("HEAD", head_oid
.hash
))
731 /* If there is no HEAD, that means it is an initial
732 * commit. Update everything in the index.
736 for (pos
= 0; pos
< active_nr
; pos
++) {
737 const struct cache_entry
*ce
= active_cache
[pos
];
738 struct cache_entry
*old
= NULL
;
742 if (ce_stage(ce
) || !ce_path_match(ce
, &pathspec
, NULL
))
745 old
= read_one_ent(NULL
, &head_oid
,
746 ce
->name
, ce_namelen(ce
), 0);
747 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
748 !oidcmp(&ce
->oid
, &old
->oid
)) {
750 continue; /* unchanged */
752 /* Be careful. The working tree may not have the
753 * path anymore, in which case, under 'allow_remove',
754 * or worse yet 'allow_replace', active_nr may decrease.
757 path
= xstrdup(ce
->name
);
761 if (save_nr
!= active_nr
)
764 clear_pathspec(&pathspec
);
768 struct refresh_params
{
773 static int refresh(struct refresh_params
*o
, unsigned int flag
)
776 read_cache_preload(NULL
);
777 *o
->has_errors
|= refresh_cache(o
->flags
| flag
);
781 static int refresh_callback(const struct option
*opt
,
782 const char *arg
, int unset
)
784 return refresh(opt
->value
, 0);
787 static int really_refresh_callback(const struct option
*opt
,
788 const char *arg
, int unset
)
790 return refresh(opt
->value
, REFRESH_REALLY
);
793 static int chmod_callback(const struct option
*opt
,
794 const char *arg
, int unset
)
796 char *flip
= opt
->value
;
797 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
798 return error("option 'chmod' expects \"+x\" or \"-x\"");
803 static int resolve_undo_clear_callback(const struct option
*opt
,
804 const char *arg
, int unset
)
806 resolve_undo_clear();
810 static int parse_new_style_cacheinfo(const char *arg
,
812 struct object_id
*oid
,
822 ul
= strtoul(arg
, &endp
, 8);
823 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
824 return -1; /* not a new-style cacheinfo */
827 if (get_oid_hex(endp
, oid
) || endp
[GIT_SHA1_HEXSZ
] != ',')
829 *path
= endp
+ GIT_SHA1_HEXSZ
+ 1;
833 static int cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
834 const struct option
*opt
, int unset
)
836 struct object_id oid
;
840 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, &oid
, &path
)) {
841 if (add_cacheinfo(mode
, &oid
, path
, 0))
842 die("git update-index: --cacheinfo cannot add %s", path
);
848 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
849 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
850 get_oid_hex(*++ctx
->argv
, &oid
) ||
851 add_cacheinfo(mode
, &oid
, *++ctx
->argv
, 0))
852 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
857 static int stdin_cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
858 const struct option
*opt
, int unset
)
860 int *nul_term_line
= opt
->value
;
863 return error("option '%s' must be the last argument", opt
->long_name
);
864 allow_add
= allow_replace
= allow_remove
= 1;
865 read_index_info(*nul_term_line
);
869 static int stdin_callback(struct parse_opt_ctx_t
*ctx
,
870 const struct option
*opt
, int unset
)
872 int *read_from_stdin
= opt
->value
;
875 return error("option '%s' must be the last argument", opt
->long_name
);
876 *read_from_stdin
= 1;
880 static int unresolve_callback(struct parse_opt_ctx_t
*ctx
,
881 const struct option
*opt
, int flags
)
883 int *has_errors
= opt
->value
;
884 const char *prefix
= startup_info
->prefix
;
886 /* consume remaining arguments. */
887 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
888 prefix
, prefix
? strlen(prefix
) : 0);
890 active_cache_changed
= 0;
892 ctx
->argv
+= ctx
->argc
- 1;
897 static int reupdate_callback(struct parse_opt_ctx_t
*ctx
,
898 const struct option
*opt
, int flags
)
900 int *has_errors
= opt
->value
;
901 const char *prefix
= startup_info
->prefix
;
903 /* consume remaining arguments. */
905 *has_errors
= do_reupdate(ctx
->argc
, ctx
->argv
,
906 prefix
, prefix
? strlen(prefix
) : 0);
908 active_cache_changed
= 0;
910 ctx
->argv
+= ctx
->argc
- 1;
915 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
917 int newfd
, entries
, has_errors
= 0, nul_term_line
= 0;
918 enum uc_mode untracked_cache
= UC_UNSPECIFIED
;
919 int read_from_stdin
= 0;
920 int prefix_length
= prefix
? strlen(prefix
) : 0;
921 int preferred_index_format
= 0;
922 char set_executable_bit
= 0;
923 struct refresh_params refresh_args
= {0, &has_errors
};
925 int split_index
= -1;
928 struct lock_file
*lock_file
;
929 struct parse_opt_ctx_t ctx
;
930 strbuf_getline_fn getline_fn
;
931 int parseopt_state
= PARSE_OPT_UNKNOWN
;
932 struct option options
[] = {
933 OPT_BIT('q', NULL
, &refresh_args
.flags
,
934 N_("continue refresh even when index needs update"),
936 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
937 N_("refresh: ignore submodules"),
938 REFRESH_IGNORE_SUBMODULES
),
939 OPT_SET_INT(0, "add", &allow_add
,
940 N_("do not ignore new files"), 1),
941 OPT_SET_INT(0, "replace", &allow_replace
,
942 N_("let files replace directories and vice-versa"), 1),
943 OPT_SET_INT(0, "remove", &allow_remove
,
944 N_("notice files missing from worktree"), 1),
945 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
946 N_("refresh even if index contains unmerged entries"),
948 {OPTION_CALLBACK
, 0, "refresh", &refresh_args
, NULL
,
949 N_("refresh stat information"),
950 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
952 {OPTION_CALLBACK
, 0, "really-refresh", &refresh_args
, NULL
,
953 N_("like --refresh, but ignore assume-unchanged setting"),
954 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
955 really_refresh_callback
},
956 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
957 N_("<mode>,<object>,<path>"),
958 N_("add the specified entry to the index"),
959 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
960 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
961 (parse_opt_cb
*) cacheinfo_callback
},
962 {OPTION_CALLBACK
, 0, "chmod", &set_executable_bit
, N_("(+/-)x"),
963 N_("override the executable bit of the listed files"),
964 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
966 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
967 N_("mark files as \"not changing\""),
968 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
969 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
970 N_("clear assumed-unchanged bit"),
971 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
972 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
973 N_("mark files as \"index-only\""),
974 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
975 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
976 N_("clear skip-worktree bit"),
977 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
978 OPT_SET_INT(0, "info-only", &info_only
,
979 N_("add to index only; do not add content to object database"), 1),
980 OPT_SET_INT(0, "force-remove", &force_remove
,
981 N_("remove named paths even if present in worktree"), 1),
982 OPT_BOOL('z', NULL
, &nul_term_line
,
983 N_("with --stdin: input lines are terminated by null bytes")),
984 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
985 N_("read list of paths to be updated from standard input"),
986 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
987 (parse_opt_cb
*) stdin_callback
},
988 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &nul_term_line
, NULL
,
989 N_("add entries from standard input to the index"),
990 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
991 (parse_opt_cb
*) stdin_cacheinfo_callback
},
992 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
993 N_("repopulate stages #2 and #3 for the listed paths"),
994 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
995 (parse_opt_cb
*) unresolve_callback
},
996 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
997 N_("only update entries that differ from HEAD"),
998 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
999 (parse_opt_cb
*) reupdate_callback
},
1000 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
1001 N_("ignore files missing from worktree"),
1002 REFRESH_IGNORE_MISSING
),
1003 OPT_SET_INT(0, "verbose", &verbose
,
1004 N_("report actions to standard output"), 1),
1005 {OPTION_CALLBACK
, 0, "clear-resolve-undo", NULL
, NULL
,
1006 N_("(for porcelains) forget saved unresolved conflicts"),
1007 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1008 resolve_undo_clear_callback
},
1009 OPT_INTEGER(0, "index-version", &preferred_index_format
,
1010 N_("write index in this format")),
1011 OPT_BOOL(0, "split-index", &split_index
,
1012 N_("enable or disable split index")),
1013 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1014 N_("enable/disable untracked cache")),
1015 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache
,
1016 N_("test if the filesystem supports untracked cache"), UC_TEST
),
1017 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1018 N_("enable untracked cache without testing the filesystem"), UC_FORCE
),
1019 OPT_SET_INT(0, "force-write-index", &force_write
,
1020 N_("write out the index even if is not flagged as changed"), 1),
1021 OPT_BOOL(0, "fsmonitor", &fsmonitor
,
1022 N_("enable or disable file system monitor")),
1023 {OPTION_SET_INT
, 0, "fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1024 N_("mark files as fsmonitor valid"),
1025 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1026 {OPTION_SET_INT
, 0, "no-fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1027 N_("clear fsmonitor valid bit"),
1028 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1032 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1033 usage_with_options(update_index_usage
, options
);
1035 git_config(git_default_config
, NULL
);
1037 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
1038 lock_file
= xcalloc(1, sizeof(struct lock_file
));
1040 /* we will diagnose later if it turns out that we need to update it */
1041 newfd
= hold_locked_index(lock_file
, 0);
1045 entries
= read_cache();
1047 die("cache corrupted");
1050 * Custom copy of parse_options() because we want to handle
1051 * filename arguments as they come.
1053 parse_options_start(&ctx
, argc
, argv
, prefix
,
1054 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
1056 if (parseopt_state
!= PARSE_OPT_DONE
)
1057 parseopt_state
= parse_options_step(&ctx
, options
,
1058 update_index_usage
);
1061 switch (parseopt_state
) {
1062 case PARSE_OPT_HELP
:
1064 case PARSE_OPT_NON_OPTION
:
1065 case PARSE_OPT_DONE
:
1067 const char *path
= ctx
.argv
[0];
1071 p
= prefix_path(prefix
, prefix_length
, path
);
1073 if (set_executable_bit
)
1074 chmod_path(set_executable_bit
, p
);
1080 case PARSE_OPT_UNKNOWN
:
1081 if (ctx
.argv
[0][1] == '-')
1082 error("unknown option '%s'", ctx
.argv
[0] + 2);
1084 error("unknown switch '%c'", *ctx
.opt
);
1085 usage_with_options(update_index_usage
, options
);
1088 argc
= parse_options_end(&ctx
);
1090 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
1091 if (preferred_index_format
) {
1092 if (preferred_index_format
< INDEX_FORMAT_LB
||
1093 INDEX_FORMAT_UB
< preferred_index_format
)
1094 die("index-version %d not in range: %d..%d",
1095 preferred_index_format
,
1096 INDEX_FORMAT_LB
, INDEX_FORMAT_UB
);
1098 if (the_index
.version
!= preferred_index_format
)
1099 active_cache_changed
|= SOMETHING_CHANGED
;
1100 the_index
.version
= preferred_index_format
;
1103 if (read_from_stdin
) {
1104 struct strbuf buf
= STRBUF_INIT
;
1105 struct strbuf unquoted
= STRBUF_INIT
;
1108 while (getline_fn(&buf
, stdin
) != EOF
) {
1110 if (!nul_term_line
&& buf
.buf
[0] == '"') {
1111 strbuf_reset(&unquoted
);
1112 if (unquote_c_style(&unquoted
, buf
.buf
, NULL
))
1113 die("line is badly quoted");
1114 strbuf_swap(&buf
, &unquoted
);
1116 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
1118 if (set_executable_bit
)
1119 chmod_path(set_executable_bit
, p
);
1122 strbuf_release(&unquoted
);
1123 strbuf_release(&buf
);
1126 if (split_index
> 0) {
1127 if (git_config_get_split_index() == 0)
1128 warning(_("core.splitIndex is set to false; "
1129 "remove or change it, if you really want to "
1130 "enable split index"));
1131 if (the_index
.split_index
)
1132 the_index
.cache_changed
|= SPLIT_INDEX_ORDERED
;
1134 add_split_index(&the_index
);
1135 } else if (!split_index
) {
1136 if (git_config_get_split_index() == 1)
1137 warning(_("core.splitIndex is set to true; "
1138 "remove or change it, if you really want to "
1139 "disable split index"));
1140 remove_split_index(&the_index
);
1143 switch (untracked_cache
) {
1144 case UC_UNSPECIFIED
:
1147 if (git_config_get_untracked_cache() == 1)
1148 warning(_("core.untrackedCache is set to true; "
1149 "remove or change it, if you really want to "
1150 "disable the untracked cache"));
1151 remove_untracked_cache(&the_index
);
1152 report(_("Untracked cache disabled"));
1156 return !test_if_untracked_cache_is_supported();
1159 if (git_config_get_untracked_cache() == 0)
1160 warning(_("core.untrackedCache is set to false; "
1161 "remove or change it, if you really want to "
1162 "enable the untracked cache"));
1163 add_untracked_cache(&the_index
);
1164 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1167 die("BUG: bad untracked_cache value: %d", untracked_cache
);
1170 if (fsmonitor
> 0) {
1171 if (git_config_get_fsmonitor() == 0)
1172 warning(_("core.fsmonitor is unset; "
1173 "set it if you really want to "
1174 "enable fsmonitor"));
1175 add_fsmonitor(&the_index
);
1176 report(_("fsmonitor enabled"));
1177 } else if (!fsmonitor
) {
1178 if (git_config_get_fsmonitor() == 1)
1179 warning(_("core.fsmonitor is set; "
1180 "remove it if you really want to "
1181 "disable fsmonitor"));
1182 remove_fsmonitor(&the_index
);
1183 report(_("fsmonitor disabled"));
1186 if (active_cache_changed
|| force_write
) {
1188 if (refresh_args
.flags
& REFRESH_QUIET
)
1190 unable_to_lock_die(get_index_file(), lock_error
);
1192 if (write_locked_index(&the_index
, lock_file
, COMMIT_LOCK
))
1193 die("Unable to write new index file");
1196 rollback_lock_file(lock_file
);
1198 return has_errors
? 1 : 0;