2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
6 #define USE_THE_INDEX_VARIABLE
8 #include "bulk-checkin.h"
10 #include "environment.h"
15 #include "cache-tree.h"
16 #include "tree-walk.h"
19 #include "resolve-undo.h"
20 #include "parse-options.h"
24 #include "split-index.h"
25 #include "fsmonitor.h"
28 * Default to not allowing changes to the list of files. The
29 * tool doesn't actually care, but this makes it harder to add
30 * files to the revision control by mistake by doing something
31 * like "git update-index *" and suddenly having all the object
32 * files be revision controlled.
35 static int allow_remove
;
36 static int allow_replace
;
38 static int force_remove
;
40 static int mark_valid_only
;
41 static int mark_skip_worktree_only
;
42 static int mark_fsmonitor_only
;
43 static int ignore_skip_worktree_entries
;
46 static struct strbuf mtime_dir
= STRBUF_INIT
;
48 /* Untracked cache mode */
57 __attribute__((format (printf
, 1, 2)))
58 static void report(const char *fmt
, ...)
66 * It is possible, though unlikely, that a caller could use the verbose
67 * output to synchronize with addition of objects to the object
68 * database. The current implementation of ODB transactions leaves
69 * objects invisible while a transaction is active, so flush the
70 * transaction here before reporting a change made by update-index.
72 flush_odb_transaction();
79 static void remove_test_directory(void)
82 remove_dir_recursively(&mtime_dir
, 0);
85 static const char *get_mtime_path(const char *path
)
87 static struct strbuf sb
= STRBUF_INIT
;
89 strbuf_addf(&sb
, "%s/%s", mtime_dir
.buf
, path
);
93 static void xmkdir(const char *path
)
95 path
= get_mtime_path(path
);
96 if (mkdir(path
, 0700))
97 die_errno(_("failed to create directory %s"), path
);
100 static int xstat_mtime_dir(struct stat
*st
)
102 if (stat(mtime_dir
.buf
, st
))
103 die_errno(_("failed to stat %s"), mtime_dir
.buf
);
107 static int create_file(const char *path
)
110 path
= get_mtime_path(path
);
111 fd
= xopen(path
, O_CREAT
| O_RDWR
, 0644);
115 static void xunlink(const char *path
)
117 path
= get_mtime_path(path
);
119 die_errno(_("failed to delete file %s"), path
);
122 static void xrmdir(const char *path
)
124 path
= get_mtime_path(path
);
126 die_errno(_("failed to delete directory %s"), path
);
129 static void avoid_racy(void)
132 * not use if we could usleep(10) if USE_NSEC is defined. The
133 * field nsec could be there, but the OS could choose to
139 static int test_if_untracked_cache_is_supported(void)
142 struct stat_data base
;
146 strbuf_addstr(&mtime_dir
, "mtime-test-XXXXXX");
147 if (!mkdtemp(mtime_dir
.buf
))
148 die_errno("Could not make temporary directory");
151 fprintf(stderr
, _("Testing mtime in '%s' "), cwd
);
154 atexit(remove_test_directory
);
155 xstat_mtime_dir(&st
);
156 fill_stat_data(&base
, &st
);
160 fd
= create_file("newfile");
161 xstat_mtime_dir(&st
);
162 if (!match_stat_data(&base
, &st
)) {
165 fprintf_ln(stderr
,_("directory stat info does not "
166 "change after adding a new file"));
169 fill_stat_data(&base
, &st
);
174 xstat_mtime_dir(&st
);
175 if (!match_stat_data(&base
, &st
)) {
178 fprintf_ln(stderr
, _("directory stat info does not change "
179 "after adding a new directory"));
182 fill_stat_data(&base
, &st
);
186 write_or_die(fd
, "data", 4);
188 xstat_mtime_dir(&st
);
189 if (match_stat_data(&base
, &st
)) {
191 fprintf_ln(stderr
, _("directory stat info changes "
192 "after updating a file"));
198 close(create_file("new-dir/new"));
199 xstat_mtime_dir(&st
);
200 if (match_stat_data(&base
, &st
)) {
202 fprintf_ln(stderr
, _("directory stat info changes after "
203 "adding a file inside subdirectory"));
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 file"));
217 fill_stat_data(&base
, &st
);
221 xunlink("new-dir/new");
223 xstat_mtime_dir(&st
);
224 if (!match_stat_data(&base
, &st
)) {
226 fprintf_ln(stderr
, _("directory stat info does not "
227 "change after deleting a directory"));
231 if (rmdir(mtime_dir
.buf
))
232 die_errno(_("failed to delete directory %s"), mtime_dir
.buf
);
233 fprintf_ln(stderr
, _(" OK"));
237 strbuf_release(&mtime_dir
);
241 static int mark_ce_flags(const char *path
, int flag
, int mark
)
243 int namelen
= strlen(path
);
244 int pos
= index_name_pos(&the_index
, path
, namelen
);
246 mark_fsmonitor_invalid(&the_index
, the_index
.cache
[pos
]);
248 the_index
.cache
[pos
]->ce_flags
|= flag
;
250 the_index
.cache
[pos
]->ce_flags
&= ~flag
;
251 the_index
.cache
[pos
]->ce_flags
|= CE_UPDATE_IN_BASE
;
252 cache_tree_invalidate_path(&the_index
, path
);
253 the_index
.cache_changed
|= CE_ENTRY_CHANGED
;
259 static int remove_one_path(const char *path
)
262 return error("%s: does not exist and --remove not passed", path
);
263 if (remove_file_from_index(&the_index
, path
))
264 return error("%s: cannot remove from the index", path
);
269 * Handle a path that couldn't be lstat'ed. It's either:
270 * - missing file (ENOENT or ENOTDIR). That's ok if we're
271 * supposed to be removing it and the removal actually
273 * - permission error. That's never ok.
275 static int process_lstat_error(const char *path
, int err
)
277 if (is_missing_file_error(err
))
278 return remove_one_path(path
);
279 return error("lstat(\"%s\"): %s", path
, strerror(err
));
282 static int add_one_path(const struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
285 struct cache_entry
*ce
;
287 /* Was the old index entry already up-to-date? */
288 if (old
&& !ce_stage(old
) && !ie_match_stat(&the_index
, old
, st
, 0))
291 ce
= make_empty_cache_entry(&the_index
, len
);
292 memcpy(ce
->name
, path
, len
);
293 ce
->ce_flags
= create_ce_flags(0);
294 ce
->ce_namelen
= len
;
295 fill_stat_cache_info(&the_index
, ce
, st
);
296 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
298 if (index_path(&the_index
, &ce
->oid
, path
, st
,
299 info_only
? 0 : HASH_WRITE_OBJECT
)) {
300 discard_cache_entry(ce
);
303 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
304 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
305 if (add_index_entry(&the_index
, ce
, option
)) {
306 discard_cache_entry(ce
);
307 return error("%s: cannot add to the index - missing --add option?", path
);
313 * Handle a path that was a directory. Four cases:
315 * - it's already a gitlink in the index, and we keep it that
316 * way, and update it if we can (if we cannot find the HEAD,
317 * we're going to keep it unchanged in the index!)
319 * - it's a *file* in the index, in which case it should be
320 * removed as a file if removal is allowed, since it doesn't
321 * exist as such any more. If removal isn't allowed, it's
324 * (NOTE! This is old and arguably fairly strange behaviour.
325 * We might want to make this an error unconditionally, and
326 * use "--force-remove" if you actually want to force removal).
328 * - it used to exist as a subdirectory (ie multiple files with
329 * this particular prefix) in the index, in which case it's wrong
330 * to try to update it as a directory.
332 * - it doesn't exist at all in the index, but it is a valid
333 * git directory, and it should be *added* as a gitlink.
335 static int process_directory(const char *path
, int len
, struct stat
*st
)
337 struct object_id oid
;
338 int pos
= index_name_pos(&the_index
, path
, len
);
340 /* Exact match: file or existing gitlink */
342 const struct cache_entry
*ce
= the_index
.cache
[pos
];
343 if (S_ISGITLINK(ce
->ce_mode
)) {
345 /* Do nothing to the index if there is no HEAD! */
346 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
349 return add_one_path(ce
, path
, len
, st
);
351 /* Should this be an unconditional error? */
352 return remove_one_path(path
);
355 /* Inexact match: is there perhaps a subdirectory match? */
357 while (pos
< the_index
.cache_nr
) {
358 const struct cache_entry
*ce
= the_index
.cache
[pos
++];
360 if (strncmp(ce
->name
, path
, len
))
362 if (ce
->name
[len
] > '/')
364 if (ce
->name
[len
] < '/')
367 /* Subdirectory match - error out */
368 return error("%s: is a directory - add individual files instead", path
);
371 /* No match - should we add it as a gitlink? */
372 if (!resolve_gitlink_ref(path
, "HEAD", &oid
))
373 return add_one_path(NULL
, path
, len
, st
);
376 return error("%s: is a directory - add files inside instead", path
);
379 static int process_path(const char *path
, struct stat
*st
, int stat_errno
)
382 const struct cache_entry
*ce
;
385 if (has_symlink_leading_path(path
, len
))
386 return error("'%s' is beyond a symbolic link", path
);
388 pos
= index_name_pos(&the_index
, path
, len
);
389 ce
= pos
< 0 ? NULL
: the_index
.cache
[pos
];
390 if (ce
&& ce_skip_worktree(ce
)) {
392 * working directory version is assumed "good"
393 * so updating it does not make sense.
394 * On the other hand, removing it from index should work
396 if (!ignore_skip_worktree_entries
&& allow_remove
&&
397 remove_file_from_index(&the_index
, path
))
398 return error("%s: cannot remove from the index", path
);
403 * First things first: get the stat information, to decide
404 * what to do about the pathname!
407 return process_lstat_error(path
, stat_errno
);
409 if (S_ISDIR(st
->st_mode
))
410 return process_directory(path
, len
, st
);
412 return add_one_path(ce
, path
, len
, st
);
415 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
416 const char *path
, int stage
)
419 struct cache_entry
*ce
;
421 if (!verify_path(path
, mode
))
422 return error("Invalid path '%s'", path
);
425 ce
= make_empty_cache_entry(&the_index
, len
);
427 oidcpy(&ce
->oid
, oid
);
428 memcpy(ce
->name
, path
, len
);
429 ce
->ce_flags
= create_ce_flags(stage
);
430 ce
->ce_namelen
= len
;
431 ce
->ce_mode
= create_ce_mode(mode
);
432 if (assume_unchanged
)
433 ce
->ce_flags
|= CE_VALID
;
434 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
435 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
436 if (add_index_entry(&the_index
, ce
, option
))
437 return error("%s: cannot add to the index - missing --add option?",
439 report("add '%s'", path
);
443 static void chmod_path(char flip
, const char *path
)
446 struct cache_entry
*ce
;
448 pos
= index_name_pos(&the_index
, path
, strlen(path
));
451 ce
= the_index
.cache
[pos
];
452 if (chmod_index_entry(&the_index
, ce
, flip
) < 0)
455 report("chmod %cx '%s'", flip
, path
);
458 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
461 static void update_one(const char *path
)
466 if (mark_valid_only
|| mark_skip_worktree_only
|| force_remove
||
469 else if (lstat(path
, &st
) < 0) {
472 } /* else stat is valid */
474 if (!verify_path(path
, st
.st_mode
)) {
475 fprintf(stderr
, "Ignoring path %s\n", path
);
478 if (mark_valid_only
) {
479 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
480 die("Unable to mark file %s", path
);
483 if (mark_skip_worktree_only
) {
484 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
485 die("Unable to mark file %s", path
);
488 if (mark_fsmonitor_only
) {
489 if (mark_ce_flags(path
, CE_FSMONITOR_VALID
, mark_fsmonitor_only
== MARK_FLAG
))
490 die("Unable to mark file %s", path
);
495 if (remove_file_from_index(&the_index
, path
))
496 die("git update-index: unable to remove %s", path
);
497 report("remove '%s'", path
);
500 if (process_path(path
, &st
, stat_errno
))
501 die("Unable to process path %s", path
);
502 report("add '%s'", path
);
505 static void read_index_info(int nul_term_line
)
507 const int hexsz
= the_hash_algo
->hexsz
;
508 struct strbuf buf
= STRBUF_INIT
;
509 struct strbuf uq
= STRBUF_INIT
;
510 strbuf_getline_fn getline_fn
;
512 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
513 while (getline_fn(&buf
, stdin
) != EOF
) {
516 struct object_id oid
;
521 /* This reads lines formatted in one of three formats:
523 * (1) mode SP sha1 TAB path
524 * The first format is what "git apply --index-info"
525 * reports, and used to reconstruct a partial tree
526 * that is used for phony merge base tree when falling
527 * back on 3-way merge.
529 * (2) mode SP type SP sha1 TAB path
530 * The second format is to stuff "git ls-tree" output
531 * into the index file.
533 * (3) mode SP sha1 SP stage TAB path
534 * This format is to put higher order stages into the
535 * index file and matches "git ls-files --stage" output.
538 ul
= strtoul(buf
.buf
, &ptr
, 8);
539 if (ptr
== buf
.buf
|| *ptr
!= ' '
540 || errno
|| (unsigned int) ul
!= ul
)
544 tab
= strchr(ptr
, '\t');
545 if (!tab
|| tab
- ptr
< hexsz
+ 1)
548 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
549 stage
= tab
[-1] - '0';
550 ptr
= tab
+ 1; /* point at the head of path */
551 tab
= tab
- 2; /* point at tail of sha1 */
555 ptr
= tab
+ 1; /* point at the head of path */
558 if (get_oid_hex(tab
- hexsz
, &oid
) ||
559 tab
[-(hexsz
+ 1)] != ' ')
563 if (!nul_term_line
&& path_name
[0] == '"') {
565 if (unquote_c_style(&uq
, path_name
, NULL
)) {
566 die("git update-index: bad quoting of path name");
571 if (!verify_path(path_name
, mode
)) {
572 fprintf(stderr
, "Ignoring path %s\n", path_name
);
577 /* mode == 0 means there is no such path -- remove */
578 if (remove_file_from_index(&the_index
, path_name
))
579 die("git update-index: unable to remove %s",
583 /* mode ' ' sha1 '\t' name
584 * ptr[-1] points at tab,
585 * ptr[-41] is at the beginning of sha1
587 ptr
[-(hexsz
+ 2)] = ptr
[-1] = 0;
588 if (add_cacheinfo(mode
, &oid
, path_name
, stage
))
589 die("git update-index: unable to update %s",
595 die("malformed index info %s", buf
.buf
);
597 strbuf_release(&buf
);
601 static const char * const update_index_usage
[] = {
602 N_("git update-index [<options>] [--] [<file>...]"),
606 static struct object_id head_oid
;
607 static struct object_id merge_head_oid
;
609 static struct cache_entry
*read_one_ent(const char *which
,
610 struct object_id
*ent
, const char *path
,
611 int namelen
, int stage
)
614 struct object_id oid
;
615 struct cache_entry
*ce
;
617 if (get_tree_entry(the_repository
, ent
, path
, &oid
, &mode
)) {
619 error("%s: not in %s branch.", path
, which
);
622 if (!the_index
.sparse_index
&& mode
== S_IFDIR
) {
624 error("%s: not a blob in %s branch.", path
, which
);
627 ce
= make_empty_cache_entry(&the_index
, namelen
);
629 oidcpy(&ce
->oid
, &oid
);
630 memcpy(ce
->name
, path
, namelen
);
631 ce
->ce_flags
= create_ce_flags(stage
);
632 ce
->ce_namelen
= namelen
;
633 ce
->ce_mode
= create_ce_mode(mode
);
637 static int unresolve_one(const char *path
)
639 int namelen
= strlen(path
);
642 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
644 /* See if there is such entry in the index. */
645 pos
= index_name_pos(&the_index
, path
, namelen
);
648 pos
= unmerge_index_entry_at(&the_index
, pos
);
649 if (pos
< the_index
.cache_nr
) {
650 const struct cache_entry
*ce
= the_index
.cache
[pos
];
652 ce_namelen(ce
) == namelen
&&
653 !memcmp(ce
->name
, path
, namelen
))
656 /* no resolve-undo information; fall back */
658 /* If there isn't, either it is unmerged, or
659 * resolved as "removed" by mistake. We do not
660 * want to do anything in the former case.
663 if (pos
< the_index
.cache_nr
) {
664 const struct cache_entry
*ce
= the_index
.cache
[pos
];
665 if (ce_namelen(ce
) == namelen
&&
666 !memcmp(ce
->name
, path
, namelen
)) {
668 "%s: skipping still unmerged path.\n",
675 /* Grab blobs from given path from HEAD and MERGE_HEAD,
676 * stuff HEAD version in stage #2,
677 * stuff MERGE_HEAD version in stage #3.
679 ce_2
= read_one_ent("our", &head_oid
, path
, namelen
, 2);
680 ce_3
= read_one_ent("their", &merge_head_oid
, path
, namelen
, 3);
682 if (!ce_2
|| !ce_3
) {
686 if (oideq(&ce_2
->oid
, &ce_3
->oid
) &&
687 ce_2
->ce_mode
== ce_3
->ce_mode
) {
688 fprintf(stderr
, "%s: identical in both, skipping.\n",
693 remove_file_from_index(&the_index
, path
);
694 if (add_index_entry(&the_index
, ce_2
, ADD_CACHE_OK_TO_ADD
)) {
695 error("%s: cannot add our version to the index.", path
);
699 if (!add_index_entry(&the_index
, ce_3
, ADD_CACHE_OK_TO_ADD
))
701 error("%s: cannot add their version to the index.", path
);
704 discard_cache_entry(ce_2
);
705 discard_cache_entry(ce_3
);
709 static void read_head_pointers(void)
711 if (read_ref("HEAD", &head_oid
))
712 die("No HEAD -- no initial commit yet?");
713 if (read_ref("MERGE_HEAD", &merge_head_oid
)) {
714 fprintf(stderr
, "Not in the middle of a merge.\n");
719 static int do_unresolve(int ac
, const char **av
,
720 const char *prefix
, int prefix_length
)
725 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
726 * are not doing a merge, so exit with success status.
728 read_head_pointers();
730 for (i
= 1; i
< ac
; i
++) {
731 const char *arg
= av
[i
];
732 char *p
= prefix_path(prefix
, prefix_length
, arg
);
733 err
|= unresolve_one(p
);
739 static int do_reupdate(const char **paths
,
742 /* Read HEAD and run update-index on paths that are
743 * merged and already different between index and HEAD.
747 struct pathspec pathspec
;
749 parse_pathspec(&pathspec
, 0,
753 if (read_ref("HEAD", &head_oid
))
754 /* If there is no HEAD, that means it is an initial
755 * commit. Update everything in the index.
759 for (pos
= 0; pos
< the_index
.cache_nr
; pos
++) {
760 const struct cache_entry
*ce
= the_index
.cache
[pos
];
761 struct cache_entry
*old
= NULL
;
765 if (ce_stage(ce
) || !ce_path_match(&the_index
, ce
, &pathspec
, NULL
))
768 old
= read_one_ent(NULL
, &head_oid
,
769 ce
->name
, ce_namelen(ce
), 0);
770 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
771 oideq(&ce
->oid
, &old
->oid
)) {
772 discard_cache_entry(old
);
773 continue; /* unchanged */
776 /* At this point, we know the contents of the sparse directory are
777 * modified with respect to HEAD, so we expand the index and restart
778 * to process each path individually
780 if (S_ISSPARSEDIR(ce
->ce_mode
)) {
781 ensure_full_index(&the_index
);
785 /* Be careful. The working tree may not have the
786 * path anymore, in which case, under 'allow_remove',
787 * or worse yet 'allow_replace', active_nr may decrease.
789 save_nr
= the_index
.cache_nr
;
790 path
= xstrdup(ce
->name
);
793 discard_cache_entry(old
);
794 if (save_nr
!= the_index
.cache_nr
)
797 clear_pathspec(&pathspec
);
801 struct refresh_params
{
806 static int refresh(struct refresh_params
*o
, unsigned int flag
)
809 repo_read_index(the_repository
);
810 *o
->has_errors
|= refresh_index(&the_index
, o
->flags
| flag
, NULL
,
812 if (has_racy_timestamp(&the_index
)) {
814 * Even if nothing else has changed, updating the file
815 * increases the chance that racy timestamps become
816 * non-racy, helping future run-time performance.
817 * We do that even in case of "errors" returned by
818 * refresh_index() as these are no actual errors.
819 * cmd_status() does the same.
821 the_index
.cache_changed
|= SOMETHING_CHANGED
;
826 static int refresh_callback(const struct option
*opt
,
827 const char *arg
, int unset
)
829 BUG_ON_OPT_NEG(unset
);
831 return refresh(opt
->value
, 0);
834 static int really_refresh_callback(const struct option
*opt
,
835 const char *arg
, int unset
)
837 BUG_ON_OPT_NEG(unset
);
839 return refresh(opt
->value
, REFRESH_REALLY
);
842 static int chmod_callback(const struct option
*opt
,
843 const char *arg
, int unset
)
845 char *flip
= opt
->value
;
846 BUG_ON_OPT_NEG(unset
);
847 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
848 return error("option 'chmod' expects \"+x\" or \"-x\"");
853 static int resolve_undo_clear_callback(const struct option
*opt
,
854 const char *arg
, int unset
)
856 BUG_ON_OPT_NEG(unset
);
858 resolve_undo_clear_index(&the_index
);
862 static int parse_new_style_cacheinfo(const char *arg
,
864 struct object_id
*oid
,
875 ul
= strtoul(arg
, &endp
, 8);
876 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
877 return -1; /* not a new-style cacheinfo */
880 if (parse_oid_hex(endp
, oid
, &p
) || *p
!= ',')
886 static enum parse_opt_result
cacheinfo_callback(
887 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
888 const char *arg
, int unset
)
890 struct object_id oid
;
894 BUG_ON_OPT_NEG(unset
);
897 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, &oid
, &path
)) {
898 if (add_cacheinfo(mode
, &oid
, path
, 0))
899 die("git update-index: --cacheinfo cannot add %s", path
);
905 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
906 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
907 get_oid_hex(*++ctx
->argv
, &oid
) ||
908 add_cacheinfo(mode
, &oid
, *++ctx
->argv
, 0))
909 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
914 static enum parse_opt_result
stdin_cacheinfo_callback(
915 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
916 const char *arg
, int unset
)
918 int *nul_term_line
= opt
->value
;
920 BUG_ON_OPT_NEG(unset
);
924 return error("option '%s' must be the last argument", opt
->long_name
);
925 allow_add
= allow_replace
= allow_remove
= 1;
926 read_index_info(*nul_term_line
);
930 static enum parse_opt_result
stdin_callback(
931 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
932 const char *arg
, int unset
)
934 int *read_from_stdin
= opt
->value
;
936 BUG_ON_OPT_NEG(unset
);
940 return error("option '%s' must be the last argument", opt
->long_name
);
941 *read_from_stdin
= 1;
945 static enum parse_opt_result
unresolve_callback(
946 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
947 const char *arg
, int unset
)
949 int *has_errors
= opt
->value
;
950 const char *prefix
= startup_info
->prefix
;
952 BUG_ON_OPT_NEG(unset
);
955 /* consume remaining arguments. */
956 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
957 prefix
, prefix
? strlen(prefix
) : 0);
959 the_index
.cache_changed
= 0;
961 ctx
->argv
+= ctx
->argc
- 1;
966 static enum parse_opt_result
reupdate_callback(
967 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
968 const char *arg
, int unset
)
970 int *has_errors
= opt
->value
;
971 const char *prefix
= startup_info
->prefix
;
973 BUG_ON_OPT_NEG(unset
);
976 /* consume remaining arguments. */
978 *has_errors
= do_reupdate(ctx
->argv
+ 1, prefix
);
980 the_index
.cache_changed
= 0;
982 ctx
->argv
+= ctx
->argc
- 1;
987 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
989 int newfd
, entries
, has_errors
= 0, nul_term_line
= 0;
990 enum uc_mode untracked_cache
= UC_UNSPECIFIED
;
991 int read_from_stdin
= 0;
992 int prefix_length
= prefix
? strlen(prefix
) : 0;
993 int preferred_index_format
= 0;
994 char set_executable_bit
= 0;
995 struct refresh_params refresh_args
= {0, &has_errors
};
997 int split_index
= -1;
1000 struct lock_file lock_file
= LOCK_INIT
;
1001 struct parse_opt_ctx_t ctx
;
1002 strbuf_getline_fn getline_fn
;
1003 int parseopt_state
= PARSE_OPT_UNKNOWN
;
1004 struct repository
*r
= the_repository
;
1005 struct option options
[] = {
1006 OPT_BIT('q', NULL
, &refresh_args
.flags
,
1007 N_("continue refresh even when index needs update"),
1009 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
1010 N_("refresh: ignore submodules"),
1011 REFRESH_IGNORE_SUBMODULES
),
1012 OPT_SET_INT(0, "add", &allow_add
,
1013 N_("do not ignore new files"), 1),
1014 OPT_SET_INT(0, "replace", &allow_replace
,
1015 N_("let files replace directories and vice-versa"), 1),
1016 OPT_SET_INT(0, "remove", &allow_remove
,
1017 N_("notice files missing from worktree"), 1),
1018 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
1019 N_("refresh even if index contains unmerged entries"),
1021 OPT_CALLBACK_F(0, "refresh", &refresh_args
, NULL
,
1022 N_("refresh stat information"),
1023 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1025 OPT_CALLBACK_F(0, "really-refresh", &refresh_args
, NULL
,
1026 N_("like --refresh, but ignore assume-unchanged setting"),
1027 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1028 really_refresh_callback
),
1029 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
1030 N_("<mode>,<object>,<path>"),
1031 N_("add the specified entry to the index"),
1032 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
1033 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
1035 cacheinfo_callback
},
1036 OPT_CALLBACK_F(0, "chmod", &set_executable_bit
, "(+|-)x",
1037 N_("override the executable bit of the listed files"),
1040 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
1041 N_("mark files as \"not changing\""),
1042 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1043 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
1044 N_("clear assumed-unchanged bit"),
1045 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1046 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
1047 N_("mark files as \"index-only\""),
1048 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1049 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
1050 N_("clear skip-worktree bit"),
1051 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1052 OPT_BOOL(0, "ignore-skip-worktree-entries", &ignore_skip_worktree_entries
,
1053 N_("do not touch index-only entries")),
1054 OPT_SET_INT(0, "info-only", &info_only
,
1055 N_("add to index only; do not add content to object database"), 1),
1056 OPT_SET_INT(0, "force-remove", &force_remove
,
1057 N_("remove named paths even if present in worktree"), 1),
1058 OPT_BOOL('z', NULL
, &nul_term_line
,
1059 N_("with --stdin: input lines are terminated by null bytes")),
1060 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
1061 N_("read list of paths to be updated from standard input"),
1062 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1063 NULL
, 0, stdin_callback
},
1064 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &nul_term_line
, NULL
,
1065 N_("add entries from standard input to the index"),
1066 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1067 NULL
, 0, stdin_cacheinfo_callback
},
1068 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
1069 N_("repopulate stages #2 and #3 for the listed paths"),
1070 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1071 NULL
, 0, unresolve_callback
},
1072 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
1073 N_("only update entries that differ from HEAD"),
1074 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1075 NULL
, 0, reupdate_callback
},
1076 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
1077 N_("ignore files missing from worktree"),
1078 REFRESH_IGNORE_MISSING
),
1079 OPT_SET_INT(0, "verbose", &verbose
,
1080 N_("report actions to standard output"), 1),
1081 OPT_CALLBACK_F(0, "clear-resolve-undo", NULL
, NULL
,
1082 N_("(for porcelains) forget saved unresolved conflicts"),
1083 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1084 resolve_undo_clear_callback
),
1085 OPT_INTEGER(0, "index-version", &preferred_index_format
,
1086 N_("write index in this format")),
1087 OPT_BOOL(0, "split-index", &split_index
,
1088 N_("enable or disable split index")),
1089 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1090 N_("enable/disable untracked cache")),
1091 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache
,
1092 N_("test if the filesystem supports untracked cache"), UC_TEST
),
1093 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1094 N_("enable untracked cache without testing the filesystem"), UC_FORCE
),
1095 OPT_SET_INT(0, "force-write-index", &force_write
,
1096 N_("write out the index even if is not flagged as changed"), 1),
1097 OPT_BOOL(0, "fsmonitor", &fsmonitor
,
1098 N_("enable or disable file system monitor")),
1099 {OPTION_SET_INT
, 0, "fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1100 N_("mark files as fsmonitor valid"),
1101 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1102 {OPTION_SET_INT
, 0, "no-fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1103 N_("clear fsmonitor valid bit"),
1104 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1108 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1109 usage_with_options(update_index_usage
, options
);
1111 git_config(git_default_config
, NULL
);
1113 prepare_repo_settings(r
);
1114 the_repository
->settings
.command_requires_full_index
= 0;
1116 /* we will diagnose later if it turns out that we need to update it */
1117 newfd
= repo_hold_locked_index(the_repository
, &lock_file
, 0);
1121 entries
= repo_read_index(the_repository
);
1123 die("cache corrupted");
1125 the_index
.updated_skipworktree
= 1;
1128 * Custom copy of parse_options() because we want to handle
1129 * filename arguments as they come.
1131 parse_options_start(&ctx
, argc
, argv
, prefix
,
1132 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
1135 * Allow the object layer to optimize adding multiple objects in
1138 begin_odb_transaction();
1140 if (parseopt_state
!= PARSE_OPT_DONE
)
1141 parseopt_state
= parse_options_step(&ctx
, options
,
1142 update_index_usage
);
1145 switch (parseopt_state
) {
1146 case PARSE_OPT_HELP
:
1147 case PARSE_OPT_ERROR
:
1149 case PARSE_OPT_COMPLETE
:
1151 case PARSE_OPT_NON_OPTION
:
1152 case PARSE_OPT_DONE
:
1154 const char *path
= ctx
.argv
[0];
1158 p
= prefix_path(prefix
, prefix_length
, path
);
1160 if (set_executable_bit
)
1161 chmod_path(set_executable_bit
, p
);
1167 case PARSE_OPT_UNKNOWN
:
1168 if (ctx
.argv
[0][1] == '-')
1169 error("unknown option '%s'", ctx
.argv
[0] + 2);
1171 error("unknown switch '%c'", *ctx
.opt
);
1172 usage_with_options(update_index_usage
, options
);
1175 argc
= parse_options_end(&ctx
);
1177 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
1178 if (preferred_index_format
) {
1179 if (preferred_index_format
< INDEX_FORMAT_LB
||
1180 INDEX_FORMAT_UB
< preferred_index_format
)
1181 die("index-version %d not in range: %d..%d",
1182 preferred_index_format
,
1183 INDEX_FORMAT_LB
, INDEX_FORMAT_UB
);
1185 if (the_index
.version
!= preferred_index_format
)
1186 the_index
.cache_changed
|= SOMETHING_CHANGED
;
1187 the_index
.version
= preferred_index_format
;
1190 if (read_from_stdin
) {
1191 struct strbuf buf
= STRBUF_INIT
;
1192 struct strbuf unquoted
= STRBUF_INIT
;
1195 while (getline_fn(&buf
, stdin
) != EOF
) {
1197 if (!nul_term_line
&& buf
.buf
[0] == '"') {
1198 strbuf_reset(&unquoted
);
1199 if (unquote_c_style(&unquoted
, buf
.buf
, NULL
))
1200 die("line is badly quoted");
1201 strbuf_swap(&buf
, &unquoted
);
1203 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
1205 if (set_executable_bit
)
1206 chmod_path(set_executable_bit
, p
);
1209 strbuf_release(&unquoted
);
1210 strbuf_release(&buf
);
1214 * By now we have added all of the new objects
1216 end_odb_transaction();
1218 if (split_index
> 0) {
1219 if (git_config_get_split_index() == 0)
1220 warning(_("core.splitIndex is set to false; "
1221 "remove or change it, if you really want to "
1222 "enable split index"));
1223 if (the_index
.split_index
)
1224 the_index
.cache_changed
|= SPLIT_INDEX_ORDERED
;
1226 add_split_index(&the_index
);
1227 } else if (!split_index
) {
1228 if (git_config_get_split_index() == 1)
1229 warning(_("core.splitIndex is set to true; "
1230 "remove or change it, if you really want to "
1231 "disable split index"));
1232 remove_split_index(&the_index
);
1235 prepare_repo_settings(r
);
1236 switch (untracked_cache
) {
1237 case UC_UNSPECIFIED
:
1240 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_WRITE
)
1241 warning(_("core.untrackedCache is set to true; "
1242 "remove or change it, if you really want to "
1243 "disable the untracked cache"));
1244 remove_untracked_cache(&the_index
);
1245 report(_("Untracked cache disabled"));
1249 return !test_if_untracked_cache_is_supported();
1252 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_REMOVE
)
1253 warning(_("core.untrackedCache is set to false; "
1254 "remove or change it, if you really want to "
1255 "enable the untracked cache"));
1256 add_untracked_cache(&the_index
);
1257 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1260 BUG("bad untracked_cache value: %d", untracked_cache
);
1263 if (fsmonitor
> 0) {
1264 enum fsmonitor_mode fsm_mode
= fsm_settings__get_mode(r
);
1265 enum fsmonitor_reason reason
= fsm_settings__get_reason(r
);
1268 * The user wants to turn on FSMonitor using the command
1269 * line argument. (We don't know (or care) whether that
1270 * is the IPC or HOOK version.)
1272 * Use one of the __get routines to force load the FSMonitor
1273 * config settings into the repo-settings. That will detect
1274 * whether the file system is compatible so that we can stop
1275 * here with a nice error message.
1277 if (reason
> FSMONITOR_REASON_OK
)
1279 fsm_settings__get_incompatible_msg(r
, reason
));
1281 if (fsm_mode
== FSMONITOR_MODE_DISABLED
) {
1282 warning(_("core.fsmonitor is unset; "
1283 "set it if you really want to "
1284 "enable fsmonitor"));
1286 add_fsmonitor(&the_index
);
1287 report(_("fsmonitor enabled"));
1288 } else if (!fsmonitor
) {
1289 enum fsmonitor_mode fsm_mode
= fsm_settings__get_mode(r
);
1290 if (fsm_mode
> FSMONITOR_MODE_DISABLED
)
1291 warning(_("core.fsmonitor is set; "
1292 "remove it if you really want to "
1293 "disable fsmonitor"));
1294 remove_fsmonitor(&the_index
);
1295 report(_("fsmonitor disabled"));
1298 if (the_index
.cache_changed
|| force_write
) {
1300 if (refresh_args
.flags
& REFRESH_QUIET
)
1302 unable_to_lock_die(get_index_file(), lock_error
);
1304 if (write_locked_index(&the_index
, &lock_file
, COMMIT_LOCK
))
1305 die("Unable to write new index file");
1308 rollback_lock_file(&lock_file
);
1310 return has_errors
? 1 : 0;