2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
8 #include "bulk-checkin.h"
10 #include "environment.h"
16 #include "cache-tree.h"
17 #include "tree-walk.h"
18 #include "object-file.h"
20 #include "resolve-undo.h"
21 #include "parse-options.h"
24 #include "read-cache.h"
25 #include "repository.h"
27 #include "sparse-index.h"
28 #include "split-index.h"
30 #include "fsmonitor.h"
31 #include "write-or-die.h"
34 * Default to not allowing changes to the list of files. The
35 * tool doesn't actually care, but this makes it harder to add
36 * files to the revision control by mistake by doing something
37 * like "git update-index *" and suddenly having all the object
38 * files be revision controlled.
41 static int allow_remove
;
42 static int allow_replace
;
44 static int force_remove
;
46 static int mark_valid_only
;
47 static int mark_skip_worktree_only
;
48 static int mark_fsmonitor_only
;
49 static int ignore_skip_worktree_entries
;
52 static struct strbuf mtime_dir
= STRBUF_INIT
;
54 /* Untracked cache mode */
63 __attribute__((format (printf
, 1, 2)))
64 static void report(const char *fmt
, ...)
72 * It is possible, though unlikely, that a caller could use the verbose
73 * output to synchronize with addition of objects to the object
74 * database. The current implementation of ODB transactions leaves
75 * objects invisible while a transaction is active, so flush the
76 * transaction here before reporting a change made by update-index.
78 flush_odb_transaction();
85 static void remove_test_directory(void)
88 remove_dir_recursively(&mtime_dir
, 0);
91 static const char *get_mtime_path(const char *path
)
93 static struct strbuf sb
= STRBUF_INIT
;
95 strbuf_addf(&sb
, "%s/%s", mtime_dir
.buf
, path
);
99 static void xmkdir(const char *path
)
101 path
= get_mtime_path(path
);
102 if (mkdir(path
, 0700))
103 die_errno(_("failed to create directory %s"), path
);
106 static int xstat_mtime_dir(struct stat
*st
)
108 if (stat(mtime_dir
.buf
, st
))
109 die_errno(_("failed to stat %s"), mtime_dir
.buf
);
113 static int create_file(const char *path
)
116 path
= get_mtime_path(path
);
117 fd
= xopen(path
, O_CREAT
| O_RDWR
, 0644);
121 static void xunlink(const char *path
)
123 path
= get_mtime_path(path
);
125 die_errno(_("failed to delete file %s"), path
);
128 static void xrmdir(const char *path
)
130 path
= get_mtime_path(path
);
132 die_errno(_("failed to delete directory %s"), path
);
135 static void avoid_racy(void)
138 * not use if we could usleep(10) if USE_NSEC is defined. The
139 * field nsec could be there, but the OS could choose to
145 static int test_if_untracked_cache_is_supported(void)
148 struct stat_data base
;
152 strbuf_addstr(&mtime_dir
, "mtime-test-XXXXXX");
153 if (!mkdtemp(mtime_dir
.buf
))
154 die_errno("Could not make temporary directory");
157 fprintf(stderr
, _("Testing mtime in '%s' "), cwd
);
160 atexit(remove_test_directory
);
161 xstat_mtime_dir(&st
);
162 fill_stat_data(&base
, &st
);
166 fd
= create_file("newfile");
167 xstat_mtime_dir(&st
);
168 if (!match_stat_data(&base
, &st
)) {
171 fprintf_ln(stderr
,_("directory stat info does not "
172 "change after adding a new file"));
175 fill_stat_data(&base
, &st
);
180 xstat_mtime_dir(&st
);
181 if (!match_stat_data(&base
, &st
)) {
184 fprintf_ln(stderr
, _("directory stat info does not change "
185 "after adding a new directory"));
188 fill_stat_data(&base
, &st
);
192 write_or_die(fd
, "data", 4);
194 xstat_mtime_dir(&st
);
195 if (match_stat_data(&base
, &st
)) {
197 fprintf_ln(stderr
, _("directory stat info changes "
198 "after updating a file"));
204 close(create_file("new-dir/new"));
205 xstat_mtime_dir(&st
);
206 if (match_stat_data(&base
, &st
)) {
208 fprintf_ln(stderr
, _("directory stat info changes after "
209 "adding a file inside subdirectory"));
216 xstat_mtime_dir(&st
);
217 if (!match_stat_data(&base
, &st
)) {
219 fprintf_ln(stderr
, _("directory stat info does not "
220 "change after deleting a file"));
223 fill_stat_data(&base
, &st
);
227 xunlink("new-dir/new");
229 xstat_mtime_dir(&st
);
230 if (!match_stat_data(&base
, &st
)) {
232 fprintf_ln(stderr
, _("directory stat info does not "
233 "change after deleting a directory"));
237 if (rmdir(mtime_dir
.buf
))
238 die_errno(_("failed to delete directory %s"), mtime_dir
.buf
);
239 fprintf_ln(stderr
, _(" OK"));
243 strbuf_release(&mtime_dir
);
247 static int mark_ce_flags(const char *path
, int flag
, int mark
)
249 int namelen
= strlen(path
);
250 int pos
= index_name_pos(the_repository
->index
, path
, namelen
);
252 mark_fsmonitor_invalid(the_repository
->index
, the_repository
->index
->cache
[pos
]);
254 the_repository
->index
->cache
[pos
]->ce_flags
|= flag
;
256 the_repository
->index
->cache
[pos
]->ce_flags
&= ~flag
;
257 the_repository
->index
->cache
[pos
]->ce_flags
|= CE_UPDATE_IN_BASE
;
258 cache_tree_invalidate_path(the_repository
->index
, path
);
259 the_repository
->index
->cache_changed
|= CE_ENTRY_CHANGED
;
265 static int remove_one_path(const char *path
)
268 return error("%s: does not exist and --remove not passed", path
);
269 if (remove_file_from_index(the_repository
->index
, path
))
270 return error("%s: cannot remove from the index", path
);
275 * Handle a path that couldn't be lstat'ed. It's either:
276 * - missing file (ENOENT or ENOTDIR). That's ok if we're
277 * supposed to be removing it and the removal actually
279 * - permission error. That's never ok.
281 static int process_lstat_error(const char *path
, int err
)
283 if (is_missing_file_error(err
))
284 return remove_one_path(path
);
285 return error("lstat(\"%s\"): %s", path
, strerror(err
));
288 static int add_one_path(const struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
291 struct cache_entry
*ce
;
293 /* Was the old index entry already up-to-date? */
294 if (old
&& !ce_stage(old
) && !ie_match_stat(the_repository
->index
, old
, st
, 0))
297 ce
= make_empty_cache_entry(the_repository
->index
, len
);
298 memcpy(ce
->name
, path
, len
);
299 ce
->ce_flags
= create_ce_flags(0);
300 ce
->ce_namelen
= len
;
301 fill_stat_cache_info(the_repository
->index
, ce
, st
);
302 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
304 if (index_path(the_repository
->index
, &ce
->oid
, path
, st
,
305 info_only
? 0 : HASH_WRITE_OBJECT
)) {
306 discard_cache_entry(ce
);
309 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
310 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
311 if (add_index_entry(the_repository
->index
, ce
, option
)) {
312 discard_cache_entry(ce
);
313 return error("%s: cannot add to the index - missing --add option?", path
);
319 * Handle a path that was a directory. Four cases:
321 * - it's already a gitlink in the index, and we keep it that
322 * way, and update it if we can (if we cannot find the HEAD,
323 * we're going to keep it unchanged in the index!)
325 * - it's a *file* in the index, in which case it should be
326 * removed as a file if removal is allowed, since it doesn't
327 * exist as such any more. If removal isn't allowed, it's
330 * (NOTE! This is old and arguably fairly strange behaviour.
331 * We might want to make this an error unconditionally, and
332 * use "--force-remove" if you actually want to force removal).
334 * - it used to exist as a subdirectory (ie multiple files with
335 * this particular prefix) in the index, in which case it's wrong
336 * to try to update it as a directory.
338 * - it doesn't exist at all in the index, but it is a valid
339 * git directory, and it should be *added* as a gitlink.
341 static int process_directory(const char *path
, int len
, struct stat
*st
)
343 struct object_id oid
;
344 int pos
= index_name_pos(the_repository
->index
, path
, len
);
346 /* Exact match: file or existing gitlink */
348 const struct cache_entry
*ce
= the_repository
->index
->cache
[pos
];
349 if (S_ISGITLINK(ce
->ce_mode
)) {
351 /* Do nothing to the index if there is no HEAD! */
352 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
355 return add_one_path(ce
, path
, len
, st
);
357 /* Should this be an unconditional error? */
358 return remove_one_path(path
);
361 /* Inexact match: is there perhaps a subdirectory match? */
363 while (pos
< the_repository
->index
->cache_nr
) {
364 const struct cache_entry
*ce
= the_repository
->index
->cache
[pos
++];
366 if (strncmp(ce
->name
, path
, len
))
368 if (ce
->name
[len
] > '/')
370 if (ce
->name
[len
] < '/')
373 /* Subdirectory match - error out */
374 return error("%s: is a directory - add individual files instead", path
);
377 /* No match - should we add it as a gitlink? */
378 if (!resolve_gitlink_ref(path
, "HEAD", &oid
))
379 return add_one_path(NULL
, path
, len
, st
);
382 return error("%s: is a directory - add files inside instead", path
);
385 static int process_path(const char *path
, struct stat
*st
, int stat_errno
)
388 const struct cache_entry
*ce
;
391 if (has_symlink_leading_path(path
, len
))
392 return error("'%s' is beyond a symbolic link", path
);
394 pos
= index_name_pos(the_repository
->index
, path
, len
);
395 ce
= pos
< 0 ? NULL
: the_repository
->index
->cache
[pos
];
396 if (ce
&& ce_skip_worktree(ce
)) {
398 * working directory version is assumed "good"
399 * so updating it does not make sense.
400 * On the other hand, removing it from index should work
402 if (!ignore_skip_worktree_entries
&& allow_remove
&&
403 remove_file_from_index(the_repository
->index
, path
))
404 return error("%s: cannot remove from the index", path
);
409 * First things first: get the stat information, to decide
410 * what to do about the pathname!
413 return process_lstat_error(path
, stat_errno
);
415 if (S_ISDIR(st
->st_mode
))
416 return process_directory(path
, len
, st
);
418 return add_one_path(ce
, path
, len
, st
);
421 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
422 const char *path
, int stage
)
425 struct cache_entry
*ce
;
427 if (!verify_path(path
, mode
))
428 return error("Invalid path '%s'", path
);
431 ce
= make_empty_cache_entry(the_repository
->index
, len
);
433 oidcpy(&ce
->oid
, oid
);
434 memcpy(ce
->name
, path
, len
);
435 ce
->ce_flags
= create_ce_flags(stage
);
436 ce
->ce_namelen
= len
;
437 ce
->ce_mode
= create_ce_mode(mode
);
438 if (assume_unchanged
)
439 ce
->ce_flags
|= CE_VALID
;
440 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
441 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
442 if (add_index_entry(the_repository
->index
, ce
, option
))
443 return error("%s: cannot add to the index - missing --add option?",
445 report("add '%s'", path
);
449 static void chmod_path(char flip
, const char *path
)
452 struct cache_entry
*ce
;
454 pos
= index_name_pos(the_repository
->index
, path
, strlen(path
));
457 ce
= the_repository
->index
->cache
[pos
];
458 if (chmod_index_entry(the_repository
->index
, ce
, flip
) < 0)
461 report("chmod %cx '%s'", flip
, path
);
464 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
467 static void update_one(const char *path
)
472 if (mark_valid_only
|| mark_skip_worktree_only
|| force_remove
||
475 else if (lstat(path
, &st
) < 0) {
478 } /* else stat is valid */
480 if (!verify_path(path
, st
.st_mode
)) {
481 fprintf(stderr
, "Ignoring path %s\n", path
);
484 if (mark_valid_only
) {
485 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
486 die("Unable to mark file %s", path
);
489 if (mark_skip_worktree_only
) {
490 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
491 die("Unable to mark file %s", path
);
494 if (mark_fsmonitor_only
) {
495 if (mark_ce_flags(path
, CE_FSMONITOR_VALID
, mark_fsmonitor_only
== MARK_FLAG
))
496 die("Unable to mark file %s", path
);
501 if (remove_file_from_index(the_repository
->index
, path
))
502 die("git update-index: unable to remove %s", path
);
503 report("remove '%s'", path
);
506 if (process_path(path
, &st
, stat_errno
))
507 die("Unable to process path %s", path
);
508 report("add '%s'", path
);
511 static void read_index_info(int nul_term_line
)
513 const int hexsz
= the_hash_algo
->hexsz
;
514 struct strbuf buf
= STRBUF_INIT
;
515 struct strbuf uq
= STRBUF_INIT
;
516 strbuf_getline_fn getline_fn
;
518 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
519 while (getline_fn(&buf
, stdin
) != EOF
) {
522 struct object_id oid
;
527 /* This reads lines formatted in one of three formats:
529 * (1) mode SP sha1 TAB path
530 * The first format is what "git apply --index-info"
531 * reports, and used to reconstruct a partial tree
532 * that is used for phony merge base tree when falling
533 * back on 3-way merge.
535 * (2) mode SP type SP sha1 TAB path
536 * The second format is to stuff "git ls-tree" output
537 * into the index file.
539 * (3) mode SP sha1 SP stage TAB path
540 * This format is to put higher order stages into the
541 * index file and matches "git ls-files --stage" output.
544 ul
= strtoul(buf
.buf
, &ptr
, 8);
545 if (ptr
== buf
.buf
|| *ptr
!= ' '
546 || errno
|| (unsigned int) ul
!= ul
)
550 tab
= strchr(ptr
, '\t');
551 if (!tab
|| tab
- ptr
< hexsz
+ 1)
554 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
555 stage
= tab
[-1] - '0';
556 ptr
= tab
+ 1; /* point at the head of path */
557 tab
= tab
- 2; /* point at tail of sha1 */
561 ptr
= tab
+ 1; /* point at the head of path */
564 if (get_oid_hex(tab
- hexsz
, &oid
) ||
565 tab
[-(hexsz
+ 1)] != ' ')
569 if (!nul_term_line
&& path_name
[0] == '"') {
571 if (unquote_c_style(&uq
, path_name
, NULL
)) {
572 die("git update-index: bad quoting of path name");
577 if (!verify_path(path_name
, mode
)) {
578 fprintf(stderr
, "Ignoring path %s\n", path_name
);
583 /* mode == 0 means there is no such path -- remove */
584 if (remove_file_from_index(the_repository
->index
, path_name
))
585 die("git update-index: unable to remove %s",
589 /* mode ' ' sha1 '\t' name
590 * ptr[-1] points at tab,
591 * ptr[-41] is at the beginning of sha1
593 ptr
[-(hexsz
+ 2)] = ptr
[-1] = 0;
594 if (add_cacheinfo(mode
, &oid
, path_name
, stage
))
595 die("git update-index: unable to update %s",
601 die("malformed index info %s", buf
.buf
);
603 strbuf_release(&buf
);
607 static const char * const update_index_usage
[] = {
608 N_("git update-index [<options>] [--] [<file>...]"),
612 static struct cache_entry
*read_one_ent(const char *which
,
613 struct object_id
*ent
, const char *path
,
614 int namelen
, int stage
)
617 struct object_id oid
;
618 struct cache_entry
*ce
;
620 if (get_tree_entry(the_repository
, ent
, path
, &oid
, &mode
)) {
622 error("%s: not in %s branch.", path
, which
);
625 if (!the_repository
->index
->sparse_index
&& mode
== S_IFDIR
) {
627 error("%s: not a blob in %s branch.", path
, which
);
630 ce
= make_empty_cache_entry(the_repository
->index
, namelen
);
632 oidcpy(&ce
->oid
, &oid
);
633 memcpy(ce
->name
, path
, namelen
);
634 ce
->ce_flags
= create_ce_flags(stage
);
635 ce
->ce_namelen
= namelen
;
636 ce
->ce_mode
= create_ce_mode(mode
);
640 static int unresolve_one(const char *path
)
642 struct string_list_item
*item
;
645 if (!the_repository
->index
->resolve_undo
)
647 item
= string_list_lookup(the_repository
->index
->resolve_undo
, path
);
649 return res
; /* no resolve-undo record for the path */
650 res
= unmerge_index_entry(the_repository
->index
, path
, item
->util
, 0);
651 FREE_AND_NULL(item
->util
);
655 static int do_unresolve(int ac
, const char **av
,
656 const char *prefix
, int prefix_length
)
661 for (i
= 1; i
< ac
; i
++) {
662 const char *arg
= av
[i
];
663 char *p
= prefix_path(prefix
, prefix_length
, arg
);
664 err
|= unresolve_one(p
);
670 static int do_reupdate(const char **paths
,
673 /* Read HEAD and run update-index on paths that are
674 * merged and already different between index and HEAD.
678 struct pathspec pathspec
;
679 struct object_id head_oid
;
681 parse_pathspec(&pathspec
, 0,
685 if (refs_read_ref(get_main_ref_store(the_repository
), "HEAD", &head_oid
))
686 /* If there is no HEAD, that means it is an initial
687 * commit. Update everything in the index.
691 for (pos
= 0; pos
< the_repository
->index
->cache_nr
; pos
++) {
692 const struct cache_entry
*ce
= the_repository
->index
->cache
[pos
];
693 struct cache_entry
*old
= NULL
;
697 if (ce_stage(ce
) || !ce_path_match(the_repository
->index
, ce
, &pathspec
, NULL
))
700 old
= read_one_ent(NULL
, &head_oid
,
701 ce
->name
, ce_namelen(ce
), 0);
702 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
703 oideq(&ce
->oid
, &old
->oid
)) {
704 discard_cache_entry(old
);
705 continue; /* unchanged */
708 /* At this point, we know the contents of the sparse directory are
709 * modified with respect to HEAD, so we expand the index and restart
710 * to process each path individually
712 if (S_ISSPARSEDIR(ce
->ce_mode
)) {
713 ensure_full_index(the_repository
->index
);
717 /* Be careful. The working tree may not have the
718 * path anymore, in which case, under 'allow_remove',
719 * or worse yet 'allow_replace', active_nr may decrease.
721 save_nr
= the_repository
->index
->cache_nr
;
722 path
= xstrdup(ce
->name
);
725 discard_cache_entry(old
);
726 if (save_nr
!= the_repository
->index
->cache_nr
)
729 clear_pathspec(&pathspec
);
733 struct refresh_params
{
738 static int refresh(struct refresh_params
*o
, unsigned int flag
)
741 repo_read_index(the_repository
);
742 *o
->has_errors
|= refresh_index(the_repository
->index
, o
->flags
| flag
, NULL
,
744 if (has_racy_timestamp(the_repository
->index
)) {
746 * Even if nothing else has changed, updating the file
747 * increases the chance that racy timestamps become
748 * non-racy, helping future run-time performance.
749 * We do that even in case of "errors" returned by
750 * refresh_index() as these are no actual errors.
751 * cmd_status() does the same.
753 the_repository
->index
->cache_changed
|= SOMETHING_CHANGED
;
758 static int refresh_callback(const struct option
*opt
,
759 const char *arg
, int unset
)
761 BUG_ON_OPT_NEG(unset
);
763 return refresh(opt
->value
, 0);
766 static int really_refresh_callback(const struct option
*opt
,
767 const char *arg
, int unset
)
769 BUG_ON_OPT_NEG(unset
);
771 return refresh(opt
->value
, REFRESH_REALLY
);
774 static int chmod_callback(const struct option
*opt
,
775 const char *arg
, int unset
)
777 char *flip
= opt
->value
;
778 BUG_ON_OPT_NEG(unset
);
779 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
780 return error("option 'chmod' expects \"+x\" or \"-x\"");
785 static int resolve_undo_clear_callback(const struct option
*opt UNUSED
,
786 const char *arg
, int unset
)
788 BUG_ON_OPT_NEG(unset
);
790 resolve_undo_clear_index(the_repository
->index
);
794 static int parse_new_style_cacheinfo(const char *arg
,
796 struct object_id
*oid
,
807 ul
= strtoul(arg
, &endp
, 8);
808 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
809 return -1; /* not a new-style cacheinfo */
812 if (parse_oid_hex(endp
, oid
, &p
) || *p
!= ',')
818 static enum parse_opt_result
cacheinfo_callback(
819 struct parse_opt_ctx_t
*ctx
, const struct option
*opt UNUSED
,
820 const char *arg
, int unset
)
822 struct object_id oid
;
826 BUG_ON_OPT_NEG(unset
);
829 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, &oid
, &path
)) {
830 if (add_cacheinfo(mode
, &oid
, path
, 0))
831 die("git update-index: --cacheinfo cannot add %s", path
);
837 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
838 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
839 get_oid_hex(*++ctx
->argv
, &oid
) ||
840 add_cacheinfo(mode
, &oid
, *++ctx
->argv
, 0))
841 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
846 static enum parse_opt_result
stdin_cacheinfo_callback(
847 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
848 const char *arg
, int unset
)
850 int *nul_term_line
= opt
->value
;
852 BUG_ON_OPT_NEG(unset
);
856 return error("option '%s' must be the last argument", opt
->long_name
);
857 allow_add
= allow_replace
= allow_remove
= 1;
858 read_index_info(*nul_term_line
);
862 static enum parse_opt_result
stdin_callback(
863 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
864 const char *arg
, int unset
)
866 int *read_from_stdin
= opt
->value
;
868 BUG_ON_OPT_NEG(unset
);
872 return error("option '%s' must be the last argument", opt
->long_name
);
873 *read_from_stdin
= 1;
877 static enum parse_opt_result
unresolve_callback(
878 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
879 const char *arg
, int unset
)
881 int *has_errors
= opt
->value
;
882 const char *prefix
= startup_info
->prefix
;
884 BUG_ON_OPT_NEG(unset
);
887 /* consume remaining arguments. */
888 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
889 prefix
, prefix
? strlen(prefix
) : 0);
891 the_repository
->index
->cache_changed
= 0;
893 ctx
->argv
+= ctx
->argc
- 1;
898 static enum parse_opt_result
reupdate_callback(
899 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
900 const char *arg
, int unset
)
902 int *has_errors
= opt
->value
;
903 const char *prefix
= startup_info
->prefix
;
905 BUG_ON_OPT_NEG(unset
);
908 /* consume remaining arguments. */
910 *has_errors
= do_reupdate(ctx
->argv
+ 1, prefix
);
912 the_repository
->index
->cache_changed
= 0;
914 ctx
->argv
+= ctx
->argc
- 1;
919 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
921 int newfd
, entries
, has_errors
= 0, nul_term_line
= 0;
922 enum uc_mode untracked_cache
= UC_UNSPECIFIED
;
923 int read_from_stdin
= 0;
924 int prefix_length
= prefix
? strlen(prefix
) : 0;
925 int preferred_index_format
= 0;
926 char set_executable_bit
= 0;
927 struct refresh_params refresh_args
= {0, &has_errors
};
929 int split_index
= -1;
932 struct lock_file lock_file
= LOCK_INIT
;
933 struct parse_opt_ctx_t ctx
;
934 strbuf_getline_fn getline_fn
;
935 int parseopt_state
= PARSE_OPT_UNKNOWN
;
936 struct repository
*r
= the_repository
;
937 struct option options
[] = {
938 OPT_BIT('q', NULL
, &refresh_args
.flags
,
939 N_("continue refresh even when index needs update"),
941 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
942 N_("refresh: ignore submodules"),
943 REFRESH_IGNORE_SUBMODULES
),
944 OPT_SET_INT(0, "add", &allow_add
,
945 N_("do not ignore new files"), 1),
946 OPT_SET_INT(0, "replace", &allow_replace
,
947 N_("let files replace directories and vice-versa"), 1),
948 OPT_SET_INT(0, "remove", &allow_remove
,
949 N_("notice files missing from worktree"), 1),
950 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
951 N_("refresh even if index contains unmerged entries"),
953 OPT_CALLBACK_F(0, "refresh", &refresh_args
, NULL
,
954 N_("refresh stat information"),
955 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
957 OPT_CALLBACK_F(0, "really-refresh", &refresh_args
, NULL
,
958 N_("like --refresh, but ignore assume-unchanged setting"),
959 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
960 really_refresh_callback
),
961 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
962 N_("<mode>,<object>,<path>"),
963 N_("add the specified entry to the index"),
964 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
965 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
968 OPT_CALLBACK_F(0, "chmod", &set_executable_bit
, "(+|-)x",
969 N_("override the executable bit of the listed files"),
972 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
973 N_("mark files as \"not changing\""),
974 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
975 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
976 N_("clear assumed-unchanged bit"),
977 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
978 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
979 N_("mark files as \"index-only\""),
980 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
981 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
982 N_("clear skip-worktree bit"),
983 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
984 OPT_BOOL(0, "ignore-skip-worktree-entries", &ignore_skip_worktree_entries
,
985 N_("do not touch index-only entries")),
986 OPT_SET_INT(0, "info-only", &info_only
,
987 N_("add to index only; do not add content to object database"), 1),
988 OPT_SET_INT(0, "force-remove", &force_remove
,
989 N_("remove named paths even if present in worktree"), 1),
990 OPT_BOOL('z', NULL
, &nul_term_line
,
991 N_("with --stdin: input lines are terminated by null bytes")),
992 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
993 N_("read list of paths to be updated from standard input"),
994 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
995 NULL
, 0, stdin_callback
},
996 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &nul_term_line
, NULL
,
997 N_("add entries from standard input to the index"),
998 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
999 NULL
, 0, stdin_cacheinfo_callback
},
1000 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
1001 N_("repopulate stages #2 and #3 for the listed paths"),
1002 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1003 NULL
, 0, unresolve_callback
},
1004 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
1005 N_("only update entries that differ from HEAD"),
1006 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1007 NULL
, 0, reupdate_callback
},
1008 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
1009 N_("ignore files missing from worktree"),
1010 REFRESH_IGNORE_MISSING
),
1011 OPT_SET_INT(0, "verbose", &verbose
,
1012 N_("report actions to standard output"), 1),
1013 OPT_CALLBACK_F(0, "clear-resolve-undo", NULL
, NULL
,
1014 N_("(for porcelains) forget saved unresolved conflicts"),
1015 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1016 resolve_undo_clear_callback
),
1017 OPT_INTEGER(0, "index-version", &preferred_index_format
,
1018 N_("write index in this format")),
1019 OPT_SET_INT(0, "show-index-version", &preferred_index_format
,
1020 N_("report on-disk index format version"), -1),
1021 OPT_BOOL(0, "split-index", &split_index
,
1022 N_("enable or disable split index")),
1023 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1024 N_("enable/disable untracked cache")),
1025 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache
,
1026 N_("test if the filesystem supports untracked cache"), UC_TEST
),
1027 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1028 N_("enable untracked cache without testing the filesystem"), UC_FORCE
),
1029 OPT_SET_INT(0, "force-write-index", &force_write
,
1030 N_("write out the index even if is not flagged as changed"), 1),
1031 OPT_BOOL(0, "fsmonitor", &fsmonitor
,
1032 N_("enable or disable file system monitor")),
1033 {OPTION_SET_INT
, 0, "fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1034 N_("mark files as fsmonitor valid"),
1035 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1036 {OPTION_SET_INT
, 0, "no-fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1037 N_("clear fsmonitor valid bit"),
1038 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1042 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1043 usage_with_options(update_index_usage
, options
);
1045 git_config(git_default_config
, NULL
);
1047 prepare_repo_settings(r
);
1048 the_repository
->settings
.command_requires_full_index
= 0;
1050 /* we will diagnose later if it turns out that we need to update it */
1051 newfd
= repo_hold_locked_index(the_repository
, &lock_file
, 0);
1055 entries
= repo_read_index(the_repository
);
1057 die("cache corrupted");
1059 the_repository
->index
->updated_skipworktree
= 1;
1062 * Custom copy of parse_options() because we want to handle
1063 * filename arguments as they come.
1065 parse_options_start(&ctx
, argc
, argv
, prefix
,
1066 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
1069 * Allow the object layer to optimize adding multiple objects in
1072 begin_odb_transaction();
1074 if (parseopt_state
!= PARSE_OPT_DONE
)
1075 parseopt_state
= parse_options_step(&ctx
, options
,
1076 update_index_usage
);
1079 switch (parseopt_state
) {
1080 case PARSE_OPT_HELP
:
1081 case PARSE_OPT_ERROR
:
1083 case PARSE_OPT_COMPLETE
:
1085 case PARSE_OPT_NON_OPTION
:
1086 case PARSE_OPT_DONE
:
1088 const char *path
= ctx
.argv
[0];
1092 p
= prefix_path(prefix
, prefix_length
, path
);
1094 if (set_executable_bit
)
1095 chmod_path(set_executable_bit
, p
);
1101 case PARSE_OPT_UNKNOWN
:
1102 if (ctx
.argv
[0][1] == '-')
1103 error("unknown option '%s'", ctx
.argv
[0] + 2);
1105 error("unknown switch '%c'", *ctx
.opt
);
1106 usage_with_options(update_index_usage
, options
);
1109 argc
= parse_options_end(&ctx
);
1111 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
1112 if (preferred_index_format
) {
1113 if (preferred_index_format
< 0) {
1114 printf(_("%d\n"), the_repository
->index
->version
);
1115 } else if (preferred_index_format
< INDEX_FORMAT_LB
||
1116 INDEX_FORMAT_UB
< preferred_index_format
) {
1117 die("index-version %d not in range: %d..%d",
1118 preferred_index_format
,
1119 INDEX_FORMAT_LB
, INDEX_FORMAT_UB
);
1121 if (the_repository
->index
->version
!= preferred_index_format
)
1122 the_repository
->index
->cache_changed
|= SOMETHING_CHANGED
;
1123 report(_("index-version: was %d, set to %d"),
1124 the_repository
->index
->version
, preferred_index_format
);
1125 the_repository
->index
->version
= preferred_index_format
;
1129 if (read_from_stdin
) {
1130 struct strbuf buf
= STRBUF_INIT
;
1131 struct strbuf unquoted
= STRBUF_INIT
;
1134 while (getline_fn(&buf
, stdin
) != EOF
) {
1136 if (!nul_term_line
&& buf
.buf
[0] == '"') {
1137 strbuf_reset(&unquoted
);
1138 if (unquote_c_style(&unquoted
, buf
.buf
, NULL
))
1139 die("line is badly quoted");
1140 strbuf_swap(&buf
, &unquoted
);
1142 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
1144 if (set_executable_bit
)
1145 chmod_path(set_executable_bit
, p
);
1148 strbuf_release(&unquoted
);
1149 strbuf_release(&buf
);
1153 * By now we have added all of the new objects
1155 end_odb_transaction();
1157 if (split_index
> 0) {
1158 if (git_config_get_split_index() == 0)
1159 warning(_("core.splitIndex is set to false; "
1160 "remove or change it, if you really want to "
1161 "enable split index"));
1162 if (the_repository
->index
->split_index
)
1163 the_repository
->index
->cache_changed
|= SPLIT_INDEX_ORDERED
;
1165 add_split_index(the_repository
->index
);
1166 } else if (!split_index
) {
1167 if (git_config_get_split_index() == 1)
1168 warning(_("core.splitIndex is set to true; "
1169 "remove or change it, if you really want to "
1170 "disable split index"));
1171 remove_split_index(the_repository
->index
);
1174 prepare_repo_settings(r
);
1175 switch (untracked_cache
) {
1176 case UC_UNSPECIFIED
:
1179 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_WRITE
)
1180 warning(_("core.untrackedCache is set to true; "
1181 "remove or change it, if you really want to "
1182 "disable the untracked cache"));
1183 remove_untracked_cache(the_repository
->index
);
1184 report(_("Untracked cache disabled"));
1188 return !test_if_untracked_cache_is_supported();
1191 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_REMOVE
)
1192 warning(_("core.untrackedCache is set to false; "
1193 "remove or change it, if you really want to "
1194 "enable the untracked cache"));
1195 add_untracked_cache(the_repository
->index
);
1196 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1199 BUG("bad untracked_cache value: %d", untracked_cache
);
1202 if (fsmonitor
> 0) {
1203 enum fsmonitor_mode fsm_mode
= fsm_settings__get_mode(r
);
1204 enum fsmonitor_reason reason
= fsm_settings__get_reason(r
);
1207 * The user wants to turn on FSMonitor using the command
1208 * line argument. (We don't know (or care) whether that
1209 * is the IPC or HOOK version.)
1211 * Use one of the __get routines to force load the FSMonitor
1212 * config settings into the repo-settings. That will detect
1213 * whether the file system is compatible so that we can stop
1214 * here with a nice error message.
1216 if (reason
> FSMONITOR_REASON_OK
)
1218 fsm_settings__get_incompatible_msg(r
, reason
));
1220 if (fsm_mode
== FSMONITOR_MODE_DISABLED
) {
1221 warning(_("core.fsmonitor is unset; "
1222 "set it if you really want to "
1223 "enable fsmonitor"));
1225 add_fsmonitor(the_repository
->index
);
1226 report(_("fsmonitor enabled"));
1227 } else if (!fsmonitor
) {
1228 enum fsmonitor_mode fsm_mode
= fsm_settings__get_mode(r
);
1229 if (fsm_mode
> FSMONITOR_MODE_DISABLED
)
1230 warning(_("core.fsmonitor is set; "
1231 "remove it if you really want to "
1232 "disable fsmonitor"));
1233 remove_fsmonitor(the_repository
->index
);
1234 report(_("fsmonitor disabled"));
1237 if (the_repository
->index
->cache_changed
|| force_write
) {
1239 if (refresh_args
.flags
& REFRESH_QUIET
)
1241 unable_to_lock_die(get_index_file(), lock_error
);
1243 if (write_locked_index(the_repository
->index
, &lock_file
, COMMIT_LOCK
))
1244 die("Unable to write new index file");
1247 rollback_lock_file(&lock_file
);
1249 return has_errors
? 1 : 0;