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"
16 #include "cache-tree.h"
17 #include "tree-walk.h"
19 #include "object-file.h"
21 #include "resolve-undo.h"
22 #include "parse-options.h"
25 #include "repository.h"
27 #include "split-index.h"
29 #include "fsmonitor.h"
30 #include "write-or-die.h"
33 * Default to not allowing changes to the list of files. The
34 * tool doesn't actually care, but this makes it harder to add
35 * files to the revision control by mistake by doing something
36 * like "git update-index *" and suddenly having all the object
37 * files be revision controlled.
40 static int allow_remove
;
41 static int allow_replace
;
43 static int force_remove
;
45 static int mark_valid_only
;
46 static int mark_skip_worktree_only
;
47 static int mark_fsmonitor_only
;
48 static int ignore_skip_worktree_entries
;
51 static struct strbuf mtime_dir
= STRBUF_INIT
;
53 /* Untracked cache mode */
62 __attribute__((format (printf
, 1, 2)))
63 static void report(const char *fmt
, ...)
71 * It is possible, though unlikely, that a caller could use the verbose
72 * output to synchronize with addition of objects to the object
73 * database. The current implementation of ODB transactions leaves
74 * objects invisible while a transaction is active, so flush the
75 * transaction here before reporting a change made by update-index.
77 flush_odb_transaction();
84 static void remove_test_directory(void)
87 remove_dir_recursively(&mtime_dir
, 0);
90 static const char *get_mtime_path(const char *path
)
92 static struct strbuf sb
= STRBUF_INIT
;
94 strbuf_addf(&sb
, "%s/%s", mtime_dir
.buf
, path
);
98 static void xmkdir(const char *path
)
100 path
= get_mtime_path(path
);
101 if (mkdir(path
, 0700))
102 die_errno(_("failed to create directory %s"), path
);
105 static int xstat_mtime_dir(struct stat
*st
)
107 if (stat(mtime_dir
.buf
, st
))
108 die_errno(_("failed to stat %s"), mtime_dir
.buf
);
112 static int create_file(const char *path
)
115 path
= get_mtime_path(path
);
116 fd
= xopen(path
, O_CREAT
| O_RDWR
, 0644);
120 static void xunlink(const char *path
)
122 path
= get_mtime_path(path
);
124 die_errno(_("failed to delete file %s"), path
);
127 static void xrmdir(const char *path
)
129 path
= get_mtime_path(path
);
131 die_errno(_("failed to delete directory %s"), path
);
134 static void avoid_racy(void)
137 * not use if we could usleep(10) if USE_NSEC is defined. The
138 * field nsec could be there, but the OS could choose to
144 static int test_if_untracked_cache_is_supported(void)
147 struct stat_data base
;
151 strbuf_addstr(&mtime_dir
, "mtime-test-XXXXXX");
152 if (!mkdtemp(mtime_dir
.buf
))
153 die_errno("Could not make temporary directory");
156 fprintf(stderr
, _("Testing mtime in '%s' "), cwd
);
159 atexit(remove_test_directory
);
160 xstat_mtime_dir(&st
);
161 fill_stat_data(&base
, &st
);
165 fd
= create_file("newfile");
166 xstat_mtime_dir(&st
);
167 if (!match_stat_data(&base
, &st
)) {
170 fprintf_ln(stderr
,_("directory stat info does not "
171 "change after adding a new file"));
174 fill_stat_data(&base
, &st
);
179 xstat_mtime_dir(&st
);
180 if (!match_stat_data(&base
, &st
)) {
183 fprintf_ln(stderr
, _("directory stat info does not change "
184 "after adding a new directory"));
187 fill_stat_data(&base
, &st
);
191 write_or_die(fd
, "data", 4);
193 xstat_mtime_dir(&st
);
194 if (match_stat_data(&base
, &st
)) {
196 fprintf_ln(stderr
, _("directory stat info changes "
197 "after updating a file"));
203 close(create_file("new-dir/new"));
204 xstat_mtime_dir(&st
);
205 if (match_stat_data(&base
, &st
)) {
207 fprintf_ln(stderr
, _("directory stat info changes after "
208 "adding a file inside subdirectory"));
215 xstat_mtime_dir(&st
);
216 if (!match_stat_data(&base
, &st
)) {
218 fprintf_ln(stderr
, _("directory stat info does not "
219 "change after deleting a file"));
222 fill_stat_data(&base
, &st
);
226 xunlink("new-dir/new");
228 xstat_mtime_dir(&st
);
229 if (!match_stat_data(&base
, &st
)) {
231 fprintf_ln(stderr
, _("directory stat info does not "
232 "change after deleting a directory"));
236 if (rmdir(mtime_dir
.buf
))
237 die_errno(_("failed to delete directory %s"), mtime_dir
.buf
);
238 fprintf_ln(stderr
, _(" OK"));
242 strbuf_release(&mtime_dir
);
246 static int mark_ce_flags(const char *path
, int flag
, int mark
)
248 int namelen
= strlen(path
);
249 int pos
= index_name_pos(&the_index
, path
, namelen
);
251 mark_fsmonitor_invalid(&the_index
, the_index
.cache
[pos
]);
253 the_index
.cache
[pos
]->ce_flags
|= flag
;
255 the_index
.cache
[pos
]->ce_flags
&= ~flag
;
256 the_index
.cache
[pos
]->ce_flags
|= CE_UPDATE_IN_BASE
;
257 cache_tree_invalidate_path(&the_index
, path
);
258 the_index
.cache_changed
|= CE_ENTRY_CHANGED
;
264 static int remove_one_path(const char *path
)
267 return error("%s: does not exist and --remove not passed", path
);
268 if (remove_file_from_index(&the_index
, path
))
269 return error("%s: cannot remove from the index", path
);
274 * Handle a path that couldn't be lstat'ed. It's either:
275 * - missing file (ENOENT or ENOTDIR). That's ok if we're
276 * supposed to be removing it and the removal actually
278 * - permission error. That's never ok.
280 static int process_lstat_error(const char *path
, int err
)
282 if (is_missing_file_error(err
))
283 return remove_one_path(path
);
284 return error("lstat(\"%s\"): %s", path
, strerror(err
));
287 static int add_one_path(const struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
290 struct cache_entry
*ce
;
292 /* Was the old index entry already up-to-date? */
293 if (old
&& !ce_stage(old
) && !ie_match_stat(&the_index
, old
, st
, 0))
296 ce
= make_empty_cache_entry(&the_index
, len
);
297 memcpy(ce
->name
, path
, len
);
298 ce
->ce_flags
= create_ce_flags(0);
299 ce
->ce_namelen
= len
;
300 fill_stat_cache_info(&the_index
, ce
, st
);
301 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
303 if (index_path(&the_index
, &ce
->oid
, path
, st
,
304 info_only
? 0 : HASH_WRITE_OBJECT
)) {
305 discard_cache_entry(ce
);
308 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
309 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
310 if (add_index_entry(&the_index
, ce
, option
)) {
311 discard_cache_entry(ce
);
312 return error("%s: cannot add to the index - missing --add option?", path
);
318 * Handle a path that was a directory. Four cases:
320 * - it's already a gitlink in the index, and we keep it that
321 * way, and update it if we can (if we cannot find the HEAD,
322 * we're going to keep it unchanged in the index!)
324 * - it's a *file* in the index, in which case it should be
325 * removed as a file if removal is allowed, since it doesn't
326 * exist as such any more. If removal isn't allowed, it's
329 * (NOTE! This is old and arguably fairly strange behaviour.
330 * We might want to make this an error unconditionally, and
331 * use "--force-remove" if you actually want to force removal).
333 * - it used to exist as a subdirectory (ie multiple files with
334 * this particular prefix) in the index, in which case it's wrong
335 * to try to update it as a directory.
337 * - it doesn't exist at all in the index, but it is a valid
338 * git directory, and it should be *added* as a gitlink.
340 static int process_directory(const char *path
, int len
, struct stat
*st
)
342 struct object_id oid
;
343 int pos
= index_name_pos(&the_index
, path
, len
);
345 /* Exact match: file or existing gitlink */
347 const struct cache_entry
*ce
= the_index
.cache
[pos
];
348 if (S_ISGITLINK(ce
->ce_mode
)) {
350 /* Do nothing to the index if there is no HEAD! */
351 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
354 return add_one_path(ce
, path
, len
, st
);
356 /* Should this be an unconditional error? */
357 return remove_one_path(path
);
360 /* Inexact match: is there perhaps a subdirectory match? */
362 while (pos
< the_index
.cache_nr
) {
363 const struct cache_entry
*ce
= the_index
.cache
[pos
++];
365 if (strncmp(ce
->name
, path
, len
))
367 if (ce
->name
[len
] > '/')
369 if (ce
->name
[len
] < '/')
372 /* Subdirectory match - error out */
373 return error("%s: is a directory - add individual files instead", path
);
376 /* No match - should we add it as a gitlink? */
377 if (!resolve_gitlink_ref(path
, "HEAD", &oid
))
378 return add_one_path(NULL
, path
, len
, st
);
381 return error("%s: is a directory - add files inside instead", path
);
384 static int process_path(const char *path
, struct stat
*st
, int stat_errno
)
387 const struct cache_entry
*ce
;
390 if (has_symlink_leading_path(path
, len
))
391 return error("'%s' is beyond a symbolic link", path
);
393 pos
= index_name_pos(&the_index
, path
, len
);
394 ce
= pos
< 0 ? NULL
: the_index
.cache
[pos
];
395 if (ce
&& ce_skip_worktree(ce
)) {
397 * working directory version is assumed "good"
398 * so updating it does not make sense.
399 * On the other hand, removing it from index should work
401 if (!ignore_skip_worktree_entries
&& allow_remove
&&
402 remove_file_from_index(&the_index
, path
))
403 return error("%s: cannot remove from the index", path
);
408 * First things first: get the stat information, to decide
409 * what to do about the pathname!
412 return process_lstat_error(path
, stat_errno
);
414 if (S_ISDIR(st
->st_mode
))
415 return process_directory(path
, len
, st
);
417 return add_one_path(ce
, path
, len
, st
);
420 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
421 const char *path
, int stage
)
424 struct cache_entry
*ce
;
426 if (!verify_path(path
, mode
))
427 return error("Invalid path '%s'", path
);
430 ce
= make_empty_cache_entry(&the_index
, len
);
432 oidcpy(&ce
->oid
, oid
);
433 memcpy(ce
->name
, path
, len
);
434 ce
->ce_flags
= create_ce_flags(stage
);
435 ce
->ce_namelen
= len
;
436 ce
->ce_mode
= create_ce_mode(mode
);
437 if (assume_unchanged
)
438 ce
->ce_flags
|= CE_VALID
;
439 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
440 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
441 if (add_index_entry(&the_index
, ce
, option
))
442 return error("%s: cannot add to the index - missing --add option?",
444 report("add '%s'", path
);
448 static void chmod_path(char flip
, const char *path
)
451 struct cache_entry
*ce
;
453 pos
= index_name_pos(&the_index
, path
, strlen(path
));
456 ce
= the_index
.cache
[pos
];
457 if (chmod_index_entry(&the_index
, ce
, flip
) < 0)
460 report("chmod %cx '%s'", flip
, path
);
463 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
466 static void update_one(const char *path
)
471 if (mark_valid_only
|| mark_skip_worktree_only
|| force_remove
||
474 else if (lstat(path
, &st
) < 0) {
477 } /* else stat is valid */
479 if (!verify_path(path
, st
.st_mode
)) {
480 fprintf(stderr
, "Ignoring path %s\n", path
);
483 if (mark_valid_only
) {
484 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
485 die("Unable to mark file %s", path
);
488 if (mark_skip_worktree_only
) {
489 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
490 die("Unable to mark file %s", path
);
493 if (mark_fsmonitor_only
) {
494 if (mark_ce_flags(path
, CE_FSMONITOR_VALID
, mark_fsmonitor_only
== MARK_FLAG
))
495 die("Unable to mark file %s", path
);
500 if (remove_file_from_index(&the_index
, path
))
501 die("git update-index: unable to remove %s", path
);
502 report("remove '%s'", path
);
505 if (process_path(path
, &st
, stat_errno
))
506 die("Unable to process path %s", path
);
507 report("add '%s'", path
);
510 static void read_index_info(int nul_term_line
)
512 const int hexsz
= the_hash_algo
->hexsz
;
513 struct strbuf buf
= STRBUF_INIT
;
514 struct strbuf uq
= STRBUF_INIT
;
515 strbuf_getline_fn getline_fn
;
517 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
518 while (getline_fn(&buf
, stdin
) != EOF
) {
521 struct object_id oid
;
526 /* This reads lines formatted in one of three formats:
528 * (1) mode SP sha1 TAB path
529 * The first format is what "git apply --index-info"
530 * reports, and used to reconstruct a partial tree
531 * that is used for phony merge base tree when falling
532 * back on 3-way merge.
534 * (2) mode SP type SP sha1 TAB path
535 * The second format is to stuff "git ls-tree" output
536 * into the index file.
538 * (3) mode SP sha1 SP stage TAB path
539 * This format is to put higher order stages into the
540 * index file and matches "git ls-files --stage" output.
543 ul
= strtoul(buf
.buf
, &ptr
, 8);
544 if (ptr
== buf
.buf
|| *ptr
!= ' '
545 || errno
|| (unsigned int) ul
!= ul
)
549 tab
= strchr(ptr
, '\t');
550 if (!tab
|| tab
- ptr
< hexsz
+ 1)
553 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
554 stage
= tab
[-1] - '0';
555 ptr
= tab
+ 1; /* point at the head of path */
556 tab
= tab
- 2; /* point at tail of sha1 */
560 ptr
= tab
+ 1; /* point at the head of path */
563 if (get_oid_hex(tab
- hexsz
, &oid
) ||
564 tab
[-(hexsz
+ 1)] != ' ')
568 if (!nul_term_line
&& path_name
[0] == '"') {
570 if (unquote_c_style(&uq
, path_name
, NULL
)) {
571 die("git update-index: bad quoting of path name");
576 if (!verify_path(path_name
, mode
)) {
577 fprintf(stderr
, "Ignoring path %s\n", path_name
);
582 /* mode == 0 means there is no such path -- remove */
583 if (remove_file_from_index(&the_index
, path_name
))
584 die("git update-index: unable to remove %s",
588 /* mode ' ' sha1 '\t' name
589 * ptr[-1] points at tab,
590 * ptr[-41] is at the beginning of sha1
592 ptr
[-(hexsz
+ 2)] = ptr
[-1] = 0;
593 if (add_cacheinfo(mode
, &oid
, path_name
, stage
))
594 die("git update-index: unable to update %s",
600 die("malformed index info %s", buf
.buf
);
602 strbuf_release(&buf
);
606 static const char * const update_index_usage
[] = {
607 N_("git update-index [<options>] [--] [<file>...]"),
611 static struct object_id head_oid
;
612 static struct object_id merge_head_oid
;
614 static struct cache_entry
*read_one_ent(const char *which
,
615 struct object_id
*ent
, const char *path
,
616 int namelen
, int stage
)
619 struct object_id oid
;
620 struct cache_entry
*ce
;
622 if (get_tree_entry(the_repository
, ent
, path
, &oid
, &mode
)) {
624 error("%s: not in %s branch.", path
, which
);
627 if (!the_index
.sparse_index
&& mode
== S_IFDIR
) {
629 error("%s: not a blob in %s branch.", path
, which
);
632 ce
= make_empty_cache_entry(&the_index
, namelen
);
634 oidcpy(&ce
->oid
, &oid
);
635 memcpy(ce
->name
, path
, namelen
);
636 ce
->ce_flags
= create_ce_flags(stage
);
637 ce
->ce_namelen
= namelen
;
638 ce
->ce_mode
= create_ce_mode(mode
);
642 static int unresolve_one(const char *path
)
644 int namelen
= strlen(path
);
647 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
649 /* See if there is such entry in the index. */
650 pos
= index_name_pos(&the_index
, path
, namelen
);
653 pos
= unmerge_index_entry_at(&the_index
, pos
);
654 if (pos
< the_index
.cache_nr
) {
655 const struct cache_entry
*ce
= the_index
.cache
[pos
];
657 ce_namelen(ce
) == namelen
&&
658 !memcmp(ce
->name
, path
, namelen
))
661 /* no resolve-undo information; fall back */
663 /* If there isn't, either it is unmerged, or
664 * resolved as "removed" by mistake. We do not
665 * want to do anything in the former case.
668 if (pos
< the_index
.cache_nr
) {
669 const struct cache_entry
*ce
= the_index
.cache
[pos
];
670 if (ce_namelen(ce
) == namelen
&&
671 !memcmp(ce
->name
, path
, namelen
)) {
673 "%s: skipping still unmerged path.\n",
680 /* Grab blobs from given path from HEAD and MERGE_HEAD,
681 * stuff HEAD version in stage #2,
682 * stuff MERGE_HEAD version in stage #3.
684 ce_2
= read_one_ent("our", &head_oid
, path
, namelen
, 2);
685 ce_3
= read_one_ent("their", &merge_head_oid
, path
, namelen
, 3);
687 if (!ce_2
|| !ce_3
) {
691 if (oideq(&ce_2
->oid
, &ce_3
->oid
) &&
692 ce_2
->ce_mode
== ce_3
->ce_mode
) {
693 fprintf(stderr
, "%s: identical in both, skipping.\n",
698 remove_file_from_index(&the_index
, path
);
699 if (add_index_entry(&the_index
, ce_2
, ADD_CACHE_OK_TO_ADD
)) {
700 error("%s: cannot add our version to the index.", path
);
704 if (!add_index_entry(&the_index
, ce_3
, ADD_CACHE_OK_TO_ADD
))
706 error("%s: cannot add their version to the index.", path
);
709 discard_cache_entry(ce_2
);
710 discard_cache_entry(ce_3
);
714 static void read_head_pointers(void)
716 if (read_ref("HEAD", &head_oid
))
717 die("No HEAD -- no initial commit yet?");
718 if (read_ref("MERGE_HEAD", &merge_head_oid
)) {
719 fprintf(stderr
, "Not in the middle of a merge.\n");
724 static int do_unresolve(int ac
, const char **av
,
725 const char *prefix
, int prefix_length
)
730 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
731 * are not doing a merge, so exit with success status.
733 read_head_pointers();
735 for (i
= 1; i
< ac
; i
++) {
736 const char *arg
= av
[i
];
737 char *p
= prefix_path(prefix
, prefix_length
, arg
);
738 err
|= unresolve_one(p
);
744 static int do_reupdate(const char **paths
,
747 /* Read HEAD and run update-index on paths that are
748 * merged and already different between index and HEAD.
752 struct pathspec pathspec
;
754 parse_pathspec(&pathspec
, 0,
758 if (read_ref("HEAD", &head_oid
))
759 /* If there is no HEAD, that means it is an initial
760 * commit. Update everything in the index.
764 for (pos
= 0; pos
< the_index
.cache_nr
; pos
++) {
765 const struct cache_entry
*ce
= the_index
.cache
[pos
];
766 struct cache_entry
*old
= NULL
;
770 if (ce_stage(ce
) || !ce_path_match(&the_index
, ce
, &pathspec
, NULL
))
773 old
= read_one_ent(NULL
, &head_oid
,
774 ce
->name
, ce_namelen(ce
), 0);
775 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
776 oideq(&ce
->oid
, &old
->oid
)) {
777 discard_cache_entry(old
);
778 continue; /* unchanged */
781 /* At this point, we know the contents of the sparse directory are
782 * modified with respect to HEAD, so we expand the index and restart
783 * to process each path individually
785 if (S_ISSPARSEDIR(ce
->ce_mode
)) {
786 ensure_full_index(&the_index
);
790 /* Be careful. The working tree may not have the
791 * path anymore, in which case, under 'allow_remove',
792 * or worse yet 'allow_replace', active_nr may decrease.
794 save_nr
= the_index
.cache_nr
;
795 path
= xstrdup(ce
->name
);
798 discard_cache_entry(old
);
799 if (save_nr
!= the_index
.cache_nr
)
802 clear_pathspec(&pathspec
);
806 struct refresh_params
{
811 static int refresh(struct refresh_params
*o
, unsigned int flag
)
814 repo_read_index(the_repository
);
815 *o
->has_errors
|= refresh_index(&the_index
, o
->flags
| flag
, NULL
,
817 if (has_racy_timestamp(&the_index
)) {
819 * Even if nothing else has changed, updating the file
820 * increases the chance that racy timestamps become
821 * non-racy, helping future run-time performance.
822 * We do that even in case of "errors" returned by
823 * refresh_index() as these are no actual errors.
824 * cmd_status() does the same.
826 the_index
.cache_changed
|= SOMETHING_CHANGED
;
831 static int refresh_callback(const struct option
*opt
,
832 const char *arg
, int unset
)
834 BUG_ON_OPT_NEG(unset
);
836 return refresh(opt
->value
, 0);
839 static int really_refresh_callback(const struct option
*opt
,
840 const char *arg
, int unset
)
842 BUG_ON_OPT_NEG(unset
);
844 return refresh(opt
->value
, REFRESH_REALLY
);
847 static int chmod_callback(const struct option
*opt
,
848 const char *arg
, int unset
)
850 char *flip
= opt
->value
;
851 BUG_ON_OPT_NEG(unset
);
852 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
853 return error("option 'chmod' expects \"+x\" or \"-x\"");
858 static int resolve_undo_clear_callback(const struct option
*opt
,
859 const char *arg
, int unset
)
861 BUG_ON_OPT_NEG(unset
);
863 resolve_undo_clear_index(&the_index
);
867 static int parse_new_style_cacheinfo(const char *arg
,
869 struct object_id
*oid
,
880 ul
= strtoul(arg
, &endp
, 8);
881 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
882 return -1; /* not a new-style cacheinfo */
885 if (parse_oid_hex(endp
, oid
, &p
) || *p
!= ',')
891 static enum parse_opt_result
cacheinfo_callback(
892 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
893 const char *arg
, int unset
)
895 struct object_id oid
;
899 BUG_ON_OPT_NEG(unset
);
902 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, &oid
, &path
)) {
903 if (add_cacheinfo(mode
, &oid
, path
, 0))
904 die("git update-index: --cacheinfo cannot add %s", path
);
910 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
911 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
912 get_oid_hex(*++ctx
->argv
, &oid
) ||
913 add_cacheinfo(mode
, &oid
, *++ctx
->argv
, 0))
914 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
919 static enum parse_opt_result
stdin_cacheinfo_callback(
920 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
921 const char *arg
, int unset
)
923 int *nul_term_line
= opt
->value
;
925 BUG_ON_OPT_NEG(unset
);
929 return error("option '%s' must be the last argument", opt
->long_name
);
930 allow_add
= allow_replace
= allow_remove
= 1;
931 read_index_info(*nul_term_line
);
935 static enum parse_opt_result
stdin_callback(
936 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
937 const char *arg
, int unset
)
939 int *read_from_stdin
= opt
->value
;
941 BUG_ON_OPT_NEG(unset
);
945 return error("option '%s' must be the last argument", opt
->long_name
);
946 *read_from_stdin
= 1;
950 static enum parse_opt_result
unresolve_callback(
951 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
952 const char *arg
, int unset
)
954 int *has_errors
= opt
->value
;
955 const char *prefix
= startup_info
->prefix
;
957 BUG_ON_OPT_NEG(unset
);
960 /* consume remaining arguments. */
961 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
962 prefix
, prefix
? strlen(prefix
) : 0);
964 the_index
.cache_changed
= 0;
966 ctx
->argv
+= ctx
->argc
- 1;
971 static enum parse_opt_result
reupdate_callback(
972 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
973 const char *arg
, int unset
)
975 int *has_errors
= opt
->value
;
976 const char *prefix
= startup_info
->prefix
;
978 BUG_ON_OPT_NEG(unset
);
981 /* consume remaining arguments. */
983 *has_errors
= do_reupdate(ctx
->argv
+ 1, prefix
);
985 the_index
.cache_changed
= 0;
987 ctx
->argv
+= ctx
->argc
- 1;
992 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
994 int newfd
, entries
, has_errors
= 0, nul_term_line
= 0;
995 enum uc_mode untracked_cache
= UC_UNSPECIFIED
;
996 int read_from_stdin
= 0;
997 int prefix_length
= prefix
? strlen(prefix
) : 0;
998 int preferred_index_format
= 0;
999 char set_executable_bit
= 0;
1000 struct refresh_params refresh_args
= {0, &has_errors
};
1002 int split_index
= -1;
1003 int force_write
= 0;
1005 struct lock_file lock_file
= LOCK_INIT
;
1006 struct parse_opt_ctx_t ctx
;
1007 strbuf_getline_fn getline_fn
;
1008 int parseopt_state
= PARSE_OPT_UNKNOWN
;
1009 struct repository
*r
= the_repository
;
1010 struct option options
[] = {
1011 OPT_BIT('q', NULL
, &refresh_args
.flags
,
1012 N_("continue refresh even when index needs update"),
1014 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
1015 N_("refresh: ignore submodules"),
1016 REFRESH_IGNORE_SUBMODULES
),
1017 OPT_SET_INT(0, "add", &allow_add
,
1018 N_("do not ignore new files"), 1),
1019 OPT_SET_INT(0, "replace", &allow_replace
,
1020 N_("let files replace directories and vice-versa"), 1),
1021 OPT_SET_INT(0, "remove", &allow_remove
,
1022 N_("notice files missing from worktree"), 1),
1023 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
1024 N_("refresh even if index contains unmerged entries"),
1026 OPT_CALLBACK_F(0, "refresh", &refresh_args
, NULL
,
1027 N_("refresh stat information"),
1028 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1030 OPT_CALLBACK_F(0, "really-refresh", &refresh_args
, NULL
,
1031 N_("like --refresh, but ignore assume-unchanged setting"),
1032 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1033 really_refresh_callback
),
1034 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
1035 N_("<mode>,<object>,<path>"),
1036 N_("add the specified entry to the index"),
1037 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
1038 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
1040 cacheinfo_callback
},
1041 OPT_CALLBACK_F(0, "chmod", &set_executable_bit
, "(+|-)x",
1042 N_("override the executable bit of the listed files"),
1045 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
1046 N_("mark files as \"not changing\""),
1047 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1048 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
1049 N_("clear assumed-unchanged bit"),
1050 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1051 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
1052 N_("mark files as \"index-only\""),
1053 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1054 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
1055 N_("clear skip-worktree bit"),
1056 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1057 OPT_BOOL(0, "ignore-skip-worktree-entries", &ignore_skip_worktree_entries
,
1058 N_("do not touch index-only entries")),
1059 OPT_SET_INT(0, "info-only", &info_only
,
1060 N_("add to index only; do not add content to object database"), 1),
1061 OPT_SET_INT(0, "force-remove", &force_remove
,
1062 N_("remove named paths even if present in worktree"), 1),
1063 OPT_BOOL('z', NULL
, &nul_term_line
,
1064 N_("with --stdin: input lines are terminated by null bytes")),
1065 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
1066 N_("read list of paths to be updated from standard input"),
1067 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1068 NULL
, 0, stdin_callback
},
1069 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &nul_term_line
, NULL
,
1070 N_("add entries from standard input to the index"),
1071 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1072 NULL
, 0, stdin_cacheinfo_callback
},
1073 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
1074 N_("repopulate stages #2 and #3 for the listed paths"),
1075 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1076 NULL
, 0, unresolve_callback
},
1077 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
1078 N_("only update entries that differ from HEAD"),
1079 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1080 NULL
, 0, reupdate_callback
},
1081 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
1082 N_("ignore files missing from worktree"),
1083 REFRESH_IGNORE_MISSING
),
1084 OPT_SET_INT(0, "verbose", &verbose
,
1085 N_("report actions to standard output"), 1),
1086 OPT_CALLBACK_F(0, "clear-resolve-undo", NULL
, NULL
,
1087 N_("(for porcelains) forget saved unresolved conflicts"),
1088 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1089 resolve_undo_clear_callback
),
1090 OPT_INTEGER(0, "index-version", &preferred_index_format
,
1091 N_("write index in this format")),
1092 OPT_BOOL(0, "split-index", &split_index
,
1093 N_("enable or disable split index")),
1094 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1095 N_("enable/disable untracked cache")),
1096 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache
,
1097 N_("test if the filesystem supports untracked cache"), UC_TEST
),
1098 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1099 N_("enable untracked cache without testing the filesystem"), UC_FORCE
),
1100 OPT_SET_INT(0, "force-write-index", &force_write
,
1101 N_("write out the index even if is not flagged as changed"), 1),
1102 OPT_BOOL(0, "fsmonitor", &fsmonitor
,
1103 N_("enable or disable file system monitor")),
1104 {OPTION_SET_INT
, 0, "fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1105 N_("mark files as fsmonitor valid"),
1106 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1107 {OPTION_SET_INT
, 0, "no-fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1108 N_("clear fsmonitor valid bit"),
1109 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1113 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1114 usage_with_options(update_index_usage
, options
);
1116 git_config(git_default_config
, NULL
);
1118 prepare_repo_settings(r
);
1119 the_repository
->settings
.command_requires_full_index
= 0;
1121 /* we will diagnose later if it turns out that we need to update it */
1122 newfd
= repo_hold_locked_index(the_repository
, &lock_file
, 0);
1126 entries
= repo_read_index(the_repository
);
1128 die("cache corrupted");
1130 the_index
.updated_skipworktree
= 1;
1133 * Custom copy of parse_options() because we want to handle
1134 * filename arguments as they come.
1136 parse_options_start(&ctx
, argc
, argv
, prefix
,
1137 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
1140 * Allow the object layer to optimize adding multiple objects in
1143 begin_odb_transaction();
1145 if (parseopt_state
!= PARSE_OPT_DONE
)
1146 parseopt_state
= parse_options_step(&ctx
, options
,
1147 update_index_usage
);
1150 switch (parseopt_state
) {
1151 case PARSE_OPT_HELP
:
1152 case PARSE_OPT_ERROR
:
1154 case PARSE_OPT_COMPLETE
:
1156 case PARSE_OPT_NON_OPTION
:
1157 case PARSE_OPT_DONE
:
1159 const char *path
= ctx
.argv
[0];
1163 p
= prefix_path(prefix
, prefix_length
, path
);
1165 if (set_executable_bit
)
1166 chmod_path(set_executable_bit
, p
);
1172 case PARSE_OPT_UNKNOWN
:
1173 if (ctx
.argv
[0][1] == '-')
1174 error("unknown option '%s'", ctx
.argv
[0] + 2);
1176 error("unknown switch '%c'", *ctx
.opt
);
1177 usage_with_options(update_index_usage
, options
);
1180 argc
= parse_options_end(&ctx
);
1182 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
1183 if (preferred_index_format
) {
1184 if (preferred_index_format
< INDEX_FORMAT_LB
||
1185 INDEX_FORMAT_UB
< preferred_index_format
)
1186 die("index-version %d not in range: %d..%d",
1187 preferred_index_format
,
1188 INDEX_FORMAT_LB
, INDEX_FORMAT_UB
);
1190 if (the_index
.version
!= preferred_index_format
)
1191 the_index
.cache_changed
|= SOMETHING_CHANGED
;
1192 the_index
.version
= preferred_index_format
;
1195 if (read_from_stdin
) {
1196 struct strbuf buf
= STRBUF_INIT
;
1197 struct strbuf unquoted
= STRBUF_INIT
;
1200 while (getline_fn(&buf
, stdin
) != EOF
) {
1202 if (!nul_term_line
&& buf
.buf
[0] == '"') {
1203 strbuf_reset(&unquoted
);
1204 if (unquote_c_style(&unquoted
, buf
.buf
, NULL
))
1205 die("line is badly quoted");
1206 strbuf_swap(&buf
, &unquoted
);
1208 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
1210 if (set_executable_bit
)
1211 chmod_path(set_executable_bit
, p
);
1214 strbuf_release(&unquoted
);
1215 strbuf_release(&buf
);
1219 * By now we have added all of the new objects
1221 end_odb_transaction();
1223 if (split_index
> 0) {
1224 if (git_config_get_split_index() == 0)
1225 warning(_("core.splitIndex is set to false; "
1226 "remove or change it, if you really want to "
1227 "enable split index"));
1228 if (the_index
.split_index
)
1229 the_index
.cache_changed
|= SPLIT_INDEX_ORDERED
;
1231 add_split_index(&the_index
);
1232 } else if (!split_index
) {
1233 if (git_config_get_split_index() == 1)
1234 warning(_("core.splitIndex is set to true; "
1235 "remove or change it, if you really want to "
1236 "disable split index"));
1237 remove_split_index(&the_index
);
1240 prepare_repo_settings(r
);
1241 switch (untracked_cache
) {
1242 case UC_UNSPECIFIED
:
1245 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_WRITE
)
1246 warning(_("core.untrackedCache is set to true; "
1247 "remove or change it, if you really want to "
1248 "disable the untracked cache"));
1249 remove_untracked_cache(&the_index
);
1250 report(_("Untracked cache disabled"));
1254 return !test_if_untracked_cache_is_supported();
1257 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_REMOVE
)
1258 warning(_("core.untrackedCache is set to false; "
1259 "remove or change it, if you really want to "
1260 "enable the untracked cache"));
1261 add_untracked_cache(&the_index
);
1262 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1265 BUG("bad untracked_cache value: %d", untracked_cache
);
1268 if (fsmonitor
> 0) {
1269 enum fsmonitor_mode fsm_mode
= fsm_settings__get_mode(r
);
1270 enum fsmonitor_reason reason
= fsm_settings__get_reason(r
);
1273 * The user wants to turn on FSMonitor using the command
1274 * line argument. (We don't know (or care) whether that
1275 * is the IPC or HOOK version.)
1277 * Use one of the __get routines to force load the FSMonitor
1278 * config settings into the repo-settings. That will detect
1279 * whether the file system is compatible so that we can stop
1280 * here with a nice error message.
1282 if (reason
> FSMONITOR_REASON_OK
)
1284 fsm_settings__get_incompatible_msg(r
, reason
));
1286 if (fsm_mode
== FSMONITOR_MODE_DISABLED
) {
1287 warning(_("core.fsmonitor is unset; "
1288 "set it if you really want to "
1289 "enable fsmonitor"));
1291 add_fsmonitor(&the_index
);
1292 report(_("fsmonitor enabled"));
1293 } else if (!fsmonitor
) {
1294 enum fsmonitor_mode fsm_mode
= fsm_settings__get_mode(r
);
1295 if (fsm_mode
> FSMONITOR_MODE_DISABLED
)
1296 warning(_("core.fsmonitor is set; "
1297 "remove it if you really want to "
1298 "disable fsmonitor"));
1299 remove_fsmonitor(&the_index
);
1300 report(_("fsmonitor disabled"));
1303 if (the_index
.cache_changed
|| force_write
) {
1305 if (refresh_args
.flags
& REFRESH_QUIET
)
1307 unable_to_lock_die(get_index_file(), lock_error
);
1309 if (write_locked_index(&the_index
, &lock_file
, COMMIT_LOCK
))
1310 die("Unable to write new index file");
1313 rollback_lock_file(&lock_file
);
1315 return has_errors
? 1 : 0;