2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
6 #define USE_THE_INDEX_VARIABLE
8 #include "bulk-checkin.h"
13 #include "cache-tree.h"
14 #include "tree-walk.h"
17 #include "resolve-undo.h"
18 #include "parse-options.h"
21 #include "split-index.h"
22 #include "fsmonitor.h"
25 * Default to not allowing changes to the list of files. The
26 * tool doesn't actually care, but this makes it harder to add
27 * files to the revision control by mistake by doing something
28 * like "git update-index *" and suddenly having all the object
29 * files be revision controlled.
32 static int allow_remove
;
33 static int allow_replace
;
35 static int force_remove
;
37 static int mark_valid_only
;
38 static int mark_skip_worktree_only
;
39 static int mark_fsmonitor_only
;
40 static int ignore_skip_worktree_entries
;
43 static struct strbuf mtime_dir
= STRBUF_INIT
;
45 /* Untracked cache mode */
54 __attribute__((format (printf
, 1, 2)))
55 static void report(const char *fmt
, ...)
63 * It is possible, though unlikely, that a caller could use the verbose
64 * output to synchronize with addition of objects to the object
65 * database. The current implementation of ODB transactions leaves
66 * objects invisible while a transaction is active, so flush the
67 * transaction here before reporting a change made by update-index.
69 flush_odb_transaction();
76 static void remove_test_directory(void)
79 remove_dir_recursively(&mtime_dir
, 0);
82 static const char *get_mtime_path(const char *path
)
84 static struct strbuf sb
= STRBUF_INIT
;
86 strbuf_addf(&sb
, "%s/%s", mtime_dir
.buf
, path
);
90 static void xmkdir(const char *path
)
92 path
= get_mtime_path(path
);
93 if (mkdir(path
, 0700))
94 die_errno(_("failed to create directory %s"), path
);
97 static int xstat_mtime_dir(struct stat
*st
)
99 if (stat(mtime_dir
.buf
, st
))
100 die_errno(_("failed to stat %s"), mtime_dir
.buf
);
104 static int create_file(const char *path
)
107 path
= get_mtime_path(path
);
108 fd
= xopen(path
, O_CREAT
| O_RDWR
, 0644);
112 static void xunlink(const char *path
)
114 path
= get_mtime_path(path
);
116 die_errno(_("failed to delete file %s"), path
);
119 static void xrmdir(const char *path
)
121 path
= get_mtime_path(path
);
123 die_errno(_("failed to delete directory %s"), path
);
126 static void avoid_racy(void)
129 * not use if we could usleep(10) if USE_NSEC is defined. The
130 * field nsec could be there, but the OS could choose to
136 static int test_if_untracked_cache_is_supported(void)
139 struct stat_data base
;
143 strbuf_addstr(&mtime_dir
, "mtime-test-XXXXXX");
144 if (!mkdtemp(mtime_dir
.buf
))
145 die_errno("Could not make temporary directory");
148 fprintf(stderr
, _("Testing mtime in '%s' "), cwd
);
151 atexit(remove_test_directory
);
152 xstat_mtime_dir(&st
);
153 fill_stat_data(&base
, &st
);
157 fd
= create_file("newfile");
158 xstat_mtime_dir(&st
);
159 if (!match_stat_data(&base
, &st
)) {
162 fprintf_ln(stderr
,_("directory stat info does not "
163 "change after adding a new file"));
166 fill_stat_data(&base
, &st
);
171 xstat_mtime_dir(&st
);
172 if (!match_stat_data(&base
, &st
)) {
175 fprintf_ln(stderr
, _("directory stat info does not change "
176 "after adding a new directory"));
179 fill_stat_data(&base
, &st
);
183 write_or_die(fd
, "data", 4);
185 xstat_mtime_dir(&st
);
186 if (match_stat_data(&base
, &st
)) {
188 fprintf_ln(stderr
, _("directory stat info changes "
189 "after updating a file"));
195 close(create_file("new-dir/new"));
196 xstat_mtime_dir(&st
);
197 if (match_stat_data(&base
, &st
)) {
199 fprintf_ln(stderr
, _("directory stat info changes after "
200 "adding a file inside subdirectory"));
207 xstat_mtime_dir(&st
);
208 if (!match_stat_data(&base
, &st
)) {
210 fprintf_ln(stderr
, _("directory stat info does not "
211 "change after deleting a file"));
214 fill_stat_data(&base
, &st
);
218 xunlink("new-dir/new");
220 xstat_mtime_dir(&st
);
221 if (!match_stat_data(&base
, &st
)) {
223 fprintf_ln(stderr
, _("directory stat info does not "
224 "change after deleting a directory"));
228 if (rmdir(mtime_dir
.buf
))
229 die_errno(_("failed to delete directory %s"), mtime_dir
.buf
);
230 fprintf_ln(stderr
, _(" OK"));
234 strbuf_release(&mtime_dir
);
238 static int mark_ce_flags(const char *path
, int flag
, int mark
)
240 int namelen
= strlen(path
);
241 int pos
= index_name_pos(&the_index
, path
, namelen
);
243 mark_fsmonitor_invalid(&the_index
, the_index
.cache
[pos
]);
245 the_index
.cache
[pos
]->ce_flags
|= flag
;
247 the_index
.cache
[pos
]->ce_flags
&= ~flag
;
248 the_index
.cache
[pos
]->ce_flags
|= CE_UPDATE_IN_BASE
;
249 cache_tree_invalidate_path(&the_index
, path
);
250 the_index
.cache_changed
|= CE_ENTRY_CHANGED
;
256 static int remove_one_path(const char *path
)
259 return error("%s: does not exist and --remove not passed", path
);
260 if (remove_file_from_index(&the_index
, path
))
261 return error("%s: cannot remove from the index", path
);
266 * Handle a path that couldn't be lstat'ed. It's either:
267 * - missing file (ENOENT or ENOTDIR). That's ok if we're
268 * supposed to be removing it and the removal actually
270 * - permission error. That's never ok.
272 static int process_lstat_error(const char *path
, int err
)
274 if (is_missing_file_error(err
))
275 return remove_one_path(path
);
276 return error("lstat(\"%s\"): %s", path
, strerror(err
));
279 static int add_one_path(const struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
282 struct cache_entry
*ce
;
284 /* Was the old index entry already up-to-date? */
285 if (old
&& !ce_stage(old
) && !ie_match_stat(&the_index
, old
, st
, 0))
288 ce
= make_empty_cache_entry(&the_index
, len
);
289 memcpy(ce
->name
, path
, len
);
290 ce
->ce_flags
= create_ce_flags(0);
291 ce
->ce_namelen
= len
;
292 fill_stat_cache_info(&the_index
, ce
, st
);
293 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
295 if (index_path(&the_index
, &ce
->oid
, path
, st
,
296 info_only
? 0 : HASH_WRITE_OBJECT
)) {
297 discard_cache_entry(ce
);
300 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
301 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
302 if (add_index_entry(&the_index
, ce
, option
)) {
303 discard_cache_entry(ce
);
304 return error("%s: cannot add to the index - missing --add option?", path
);
310 * Handle a path that was a directory. Four cases:
312 * - it's already a gitlink in the index, and we keep it that
313 * way, and update it if we can (if we cannot find the HEAD,
314 * we're going to keep it unchanged in the index!)
316 * - it's a *file* in the index, in which case it should be
317 * removed as a file if removal is allowed, since it doesn't
318 * exist as such any more. If removal isn't allowed, it's
321 * (NOTE! This is old and arguably fairly strange behaviour.
322 * We might want to make this an error unconditionally, and
323 * use "--force-remove" if you actually want to force removal).
325 * - it used to exist as a subdirectory (ie multiple files with
326 * this particular prefix) in the index, in which case it's wrong
327 * to try to update it as a directory.
329 * - it doesn't exist at all in the index, but it is a valid
330 * git directory, and it should be *added* as a gitlink.
332 static int process_directory(const char *path
, int len
, struct stat
*st
)
334 struct object_id oid
;
335 int pos
= index_name_pos(&the_index
, path
, len
);
337 /* Exact match: file or existing gitlink */
339 const struct cache_entry
*ce
= the_index
.cache
[pos
];
340 if (S_ISGITLINK(ce
->ce_mode
)) {
342 /* Do nothing to the index if there is no HEAD! */
343 if (resolve_gitlink_ref(path
, "HEAD", &oid
) < 0)
346 return add_one_path(ce
, path
, len
, st
);
348 /* Should this be an unconditional error? */
349 return remove_one_path(path
);
352 /* Inexact match: is there perhaps a subdirectory match? */
354 while (pos
< the_index
.cache_nr
) {
355 const struct cache_entry
*ce
= the_index
.cache
[pos
++];
357 if (strncmp(ce
->name
, path
, len
))
359 if (ce
->name
[len
] > '/')
361 if (ce
->name
[len
] < '/')
364 /* Subdirectory match - error out */
365 return error("%s: is a directory - add individual files instead", path
);
368 /* No match - should we add it as a gitlink? */
369 if (!resolve_gitlink_ref(path
, "HEAD", &oid
))
370 return add_one_path(NULL
, path
, len
, st
);
373 return error("%s: is a directory - add files inside instead", path
);
376 static int process_path(const char *path
, struct stat
*st
, int stat_errno
)
379 const struct cache_entry
*ce
;
382 if (has_symlink_leading_path(path
, len
))
383 return error("'%s' is beyond a symbolic link", path
);
385 pos
= index_name_pos(&the_index
, path
, len
);
386 ce
= pos
< 0 ? NULL
: the_index
.cache
[pos
];
387 if (ce
&& ce_skip_worktree(ce
)) {
389 * working directory version is assumed "good"
390 * so updating it does not make sense.
391 * On the other hand, removing it from index should work
393 if (!ignore_skip_worktree_entries
&& allow_remove
&&
394 remove_file_from_index(&the_index
, path
))
395 return error("%s: cannot remove from the index", path
);
400 * First things first: get the stat information, to decide
401 * what to do about the pathname!
404 return process_lstat_error(path
, stat_errno
);
406 if (S_ISDIR(st
->st_mode
))
407 return process_directory(path
, len
, st
);
409 return add_one_path(ce
, path
, len
, st
);
412 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
413 const char *path
, int stage
)
416 struct cache_entry
*ce
;
418 if (!verify_path(path
, mode
))
419 return error("Invalid path '%s'", path
);
422 ce
= make_empty_cache_entry(&the_index
, len
);
424 oidcpy(&ce
->oid
, oid
);
425 memcpy(ce
->name
, path
, len
);
426 ce
->ce_flags
= create_ce_flags(stage
);
427 ce
->ce_namelen
= len
;
428 ce
->ce_mode
= create_ce_mode(mode
);
429 if (assume_unchanged
)
430 ce
->ce_flags
|= CE_VALID
;
431 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
432 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
433 if (add_index_entry(&the_index
, ce
, option
))
434 return error("%s: cannot add to the index - missing --add option?",
436 report("add '%s'", path
);
440 static void chmod_path(char flip
, const char *path
)
443 struct cache_entry
*ce
;
445 pos
= index_name_pos(&the_index
, path
, strlen(path
));
448 ce
= the_index
.cache
[pos
];
449 if (chmod_index_entry(&the_index
, ce
, flip
) < 0)
452 report("chmod %cx '%s'", flip
, path
);
455 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
458 static void update_one(const char *path
)
463 if (mark_valid_only
|| mark_skip_worktree_only
|| force_remove
||
466 else if (lstat(path
, &st
) < 0) {
469 } /* else stat is valid */
471 if (!verify_path(path
, st
.st_mode
)) {
472 fprintf(stderr
, "Ignoring path %s\n", path
);
475 if (mark_valid_only
) {
476 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
477 die("Unable to mark file %s", path
);
480 if (mark_skip_worktree_only
) {
481 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
482 die("Unable to mark file %s", path
);
485 if (mark_fsmonitor_only
) {
486 if (mark_ce_flags(path
, CE_FSMONITOR_VALID
, mark_fsmonitor_only
== MARK_FLAG
))
487 die("Unable to mark file %s", path
);
492 if (remove_file_from_index(&the_index
, path
))
493 die("git update-index: unable to remove %s", path
);
494 report("remove '%s'", path
);
497 if (process_path(path
, &st
, stat_errno
))
498 die("Unable to process path %s", path
);
499 report("add '%s'", path
);
502 static void read_index_info(int nul_term_line
)
504 const int hexsz
= the_hash_algo
->hexsz
;
505 struct strbuf buf
= STRBUF_INIT
;
506 struct strbuf uq
= STRBUF_INIT
;
507 strbuf_getline_fn getline_fn
;
509 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
510 while (getline_fn(&buf
, stdin
) != EOF
) {
513 struct object_id oid
;
518 /* This reads lines formatted in one of three formats:
520 * (1) mode SP sha1 TAB path
521 * The first format is what "git apply --index-info"
522 * reports, and used to reconstruct a partial tree
523 * that is used for phony merge base tree when falling
524 * back on 3-way merge.
526 * (2) mode SP type SP sha1 TAB path
527 * The second format is to stuff "git ls-tree" output
528 * into the index file.
530 * (3) mode SP sha1 SP stage TAB path
531 * This format is to put higher order stages into the
532 * index file and matches "git ls-files --stage" output.
535 ul
= strtoul(buf
.buf
, &ptr
, 8);
536 if (ptr
== buf
.buf
|| *ptr
!= ' '
537 || errno
|| (unsigned int) ul
!= ul
)
541 tab
= strchr(ptr
, '\t');
542 if (!tab
|| tab
- ptr
< hexsz
+ 1)
545 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
546 stage
= tab
[-1] - '0';
547 ptr
= tab
+ 1; /* point at the head of path */
548 tab
= tab
- 2; /* point at tail of sha1 */
552 ptr
= tab
+ 1; /* point at the head of path */
555 if (get_oid_hex(tab
- hexsz
, &oid
) ||
556 tab
[-(hexsz
+ 1)] != ' ')
560 if (!nul_term_line
&& path_name
[0] == '"') {
562 if (unquote_c_style(&uq
, path_name
, NULL
)) {
563 die("git update-index: bad quoting of path name");
568 if (!verify_path(path_name
, mode
)) {
569 fprintf(stderr
, "Ignoring path %s\n", path_name
);
574 /* mode == 0 means there is no such path -- remove */
575 if (remove_file_from_index(&the_index
, path_name
))
576 die("git update-index: unable to remove %s",
580 /* mode ' ' sha1 '\t' name
581 * ptr[-1] points at tab,
582 * ptr[-41] is at the beginning of sha1
584 ptr
[-(hexsz
+ 2)] = ptr
[-1] = 0;
585 if (add_cacheinfo(mode
, &oid
, path_name
, stage
))
586 die("git update-index: unable to update %s",
592 die("malformed index info %s", buf
.buf
);
594 strbuf_release(&buf
);
598 static const char * const update_index_usage
[] = {
599 N_("git update-index [<options>] [--] [<file>...]"),
603 static struct object_id head_oid
;
604 static struct object_id merge_head_oid
;
606 static struct cache_entry
*read_one_ent(const char *which
,
607 struct object_id
*ent
, const char *path
,
608 int namelen
, int stage
)
611 struct object_id oid
;
612 struct cache_entry
*ce
;
614 if (get_tree_entry(the_repository
, ent
, path
, &oid
, &mode
)) {
616 error("%s: not in %s branch.", path
, which
);
619 if (!the_index
.sparse_index
&& mode
== S_IFDIR
) {
621 error("%s: not a blob in %s branch.", path
, which
);
624 ce
= make_empty_cache_entry(&the_index
, namelen
);
626 oidcpy(&ce
->oid
, &oid
);
627 memcpy(ce
->name
, path
, namelen
);
628 ce
->ce_flags
= create_ce_flags(stage
);
629 ce
->ce_namelen
= namelen
;
630 ce
->ce_mode
= create_ce_mode(mode
);
634 static int unresolve_one(const char *path
)
636 int namelen
= strlen(path
);
639 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
641 /* See if there is such entry in the index. */
642 pos
= index_name_pos(&the_index
, path
, namelen
);
645 pos
= unmerge_index_entry_at(&the_index
, pos
);
646 if (pos
< the_index
.cache_nr
) {
647 const struct cache_entry
*ce
= the_index
.cache
[pos
];
649 ce_namelen(ce
) == namelen
&&
650 !memcmp(ce
->name
, path
, namelen
))
653 /* no resolve-undo information; fall back */
655 /* If there isn't, either it is unmerged, or
656 * resolved as "removed" by mistake. We do not
657 * want to do anything in the former case.
660 if (pos
< the_index
.cache_nr
) {
661 const struct cache_entry
*ce
= the_index
.cache
[pos
];
662 if (ce_namelen(ce
) == namelen
&&
663 !memcmp(ce
->name
, path
, namelen
)) {
665 "%s: skipping still unmerged path.\n",
672 /* Grab blobs from given path from HEAD and MERGE_HEAD,
673 * stuff HEAD version in stage #2,
674 * stuff MERGE_HEAD version in stage #3.
676 ce_2
= read_one_ent("our", &head_oid
, path
, namelen
, 2);
677 ce_3
= read_one_ent("their", &merge_head_oid
, path
, namelen
, 3);
679 if (!ce_2
|| !ce_3
) {
683 if (oideq(&ce_2
->oid
, &ce_3
->oid
) &&
684 ce_2
->ce_mode
== ce_3
->ce_mode
) {
685 fprintf(stderr
, "%s: identical in both, skipping.\n",
690 remove_file_from_index(&the_index
, path
);
691 if (add_index_entry(&the_index
, ce_2
, ADD_CACHE_OK_TO_ADD
)) {
692 error("%s: cannot add our version to the index.", path
);
696 if (!add_index_entry(&the_index
, ce_3
, ADD_CACHE_OK_TO_ADD
))
698 error("%s: cannot add their version to the index.", path
);
701 discard_cache_entry(ce_2
);
702 discard_cache_entry(ce_3
);
706 static void read_head_pointers(void)
708 if (read_ref("HEAD", &head_oid
))
709 die("No HEAD -- no initial commit yet?");
710 if (read_ref("MERGE_HEAD", &merge_head_oid
)) {
711 fprintf(stderr
, "Not in the middle of a merge.\n");
716 static int do_unresolve(int ac
, const char **av
,
717 const char *prefix
, int prefix_length
)
722 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
723 * are not doing a merge, so exit with success status.
725 read_head_pointers();
727 for (i
= 1; i
< ac
; i
++) {
728 const char *arg
= av
[i
];
729 char *p
= prefix_path(prefix
, prefix_length
, arg
);
730 err
|= unresolve_one(p
);
736 static int do_reupdate(const char **paths
,
739 /* Read HEAD and run update-index on paths that are
740 * merged and already different between index and HEAD.
744 struct pathspec pathspec
;
746 parse_pathspec(&pathspec
, 0,
750 if (read_ref("HEAD", &head_oid
))
751 /* If there is no HEAD, that means it is an initial
752 * commit. Update everything in the index.
756 for (pos
= 0; pos
< the_index
.cache_nr
; pos
++) {
757 const struct cache_entry
*ce
= the_index
.cache
[pos
];
758 struct cache_entry
*old
= NULL
;
762 if (ce_stage(ce
) || !ce_path_match(&the_index
, ce
, &pathspec
, NULL
))
765 old
= read_one_ent(NULL
, &head_oid
,
766 ce
->name
, ce_namelen(ce
), 0);
767 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
768 oideq(&ce
->oid
, &old
->oid
)) {
769 discard_cache_entry(old
);
770 continue; /* unchanged */
773 /* At this point, we know the contents of the sparse directory are
774 * modified with respect to HEAD, so we expand the index and restart
775 * to process each path individually
777 if (S_ISSPARSEDIR(ce
->ce_mode
)) {
778 ensure_full_index(&the_index
);
782 /* Be careful. The working tree may not have the
783 * path anymore, in which case, under 'allow_remove',
784 * or worse yet 'allow_replace', active_nr may decrease.
786 save_nr
= the_index
.cache_nr
;
787 path
= xstrdup(ce
->name
);
790 discard_cache_entry(old
);
791 if (save_nr
!= the_index
.cache_nr
)
794 clear_pathspec(&pathspec
);
798 struct refresh_params
{
803 static int refresh(struct refresh_params
*o
, unsigned int flag
)
806 repo_read_index(the_repository
);
807 *o
->has_errors
|= refresh_index(&the_index
, o
->flags
| flag
, NULL
,
809 if (has_racy_timestamp(&the_index
)) {
811 * Even if nothing else has changed, updating the file
812 * increases the chance that racy timestamps become
813 * non-racy, helping future run-time performance.
814 * We do that even in case of "errors" returned by
815 * refresh_index() as these are no actual errors.
816 * cmd_status() does the same.
818 the_index
.cache_changed
|= SOMETHING_CHANGED
;
823 static int refresh_callback(const struct option
*opt
,
824 const char *arg
, int unset
)
826 BUG_ON_OPT_NEG(unset
);
828 return refresh(opt
->value
, 0);
831 static int really_refresh_callback(const struct option
*opt
,
832 const char *arg
, int unset
)
834 BUG_ON_OPT_NEG(unset
);
836 return refresh(opt
->value
, REFRESH_REALLY
);
839 static int chmod_callback(const struct option
*opt
,
840 const char *arg
, int unset
)
842 char *flip
= opt
->value
;
843 BUG_ON_OPT_NEG(unset
);
844 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
845 return error("option 'chmod' expects \"+x\" or \"-x\"");
850 static int resolve_undo_clear_callback(const struct option
*opt
,
851 const char *arg
, int unset
)
853 BUG_ON_OPT_NEG(unset
);
855 resolve_undo_clear_index(&the_index
);
859 static int parse_new_style_cacheinfo(const char *arg
,
861 struct object_id
*oid
,
872 ul
= strtoul(arg
, &endp
, 8);
873 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
874 return -1; /* not a new-style cacheinfo */
877 if (parse_oid_hex(endp
, oid
, &p
) || *p
!= ',')
883 static enum parse_opt_result
cacheinfo_callback(
884 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
885 const char *arg
, int unset
)
887 struct object_id oid
;
891 BUG_ON_OPT_NEG(unset
);
894 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, &oid
, &path
)) {
895 if (add_cacheinfo(mode
, &oid
, path
, 0))
896 die("git update-index: --cacheinfo cannot add %s", path
);
902 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
903 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
904 get_oid_hex(*++ctx
->argv
, &oid
) ||
905 add_cacheinfo(mode
, &oid
, *++ctx
->argv
, 0))
906 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
911 static enum parse_opt_result
stdin_cacheinfo_callback(
912 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
913 const char *arg
, int unset
)
915 int *nul_term_line
= opt
->value
;
917 BUG_ON_OPT_NEG(unset
);
921 return error("option '%s' must be the last argument", opt
->long_name
);
922 allow_add
= allow_replace
= allow_remove
= 1;
923 read_index_info(*nul_term_line
);
927 static enum parse_opt_result
stdin_callback(
928 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
929 const char *arg
, int unset
)
931 int *read_from_stdin
= opt
->value
;
933 BUG_ON_OPT_NEG(unset
);
937 return error("option '%s' must be the last argument", opt
->long_name
);
938 *read_from_stdin
= 1;
942 static enum parse_opt_result
unresolve_callback(
943 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
944 const char *arg
, int unset
)
946 int *has_errors
= opt
->value
;
947 const char *prefix
= startup_info
->prefix
;
949 BUG_ON_OPT_NEG(unset
);
952 /* consume remaining arguments. */
953 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
954 prefix
, prefix
? strlen(prefix
) : 0);
956 the_index
.cache_changed
= 0;
958 ctx
->argv
+= ctx
->argc
- 1;
963 static enum parse_opt_result
reupdate_callback(
964 struct parse_opt_ctx_t
*ctx
, const struct option
*opt
,
965 const char *arg
, int unset
)
967 int *has_errors
= opt
->value
;
968 const char *prefix
= startup_info
->prefix
;
970 BUG_ON_OPT_NEG(unset
);
973 /* consume remaining arguments. */
975 *has_errors
= do_reupdate(ctx
->argv
+ 1, prefix
);
977 the_index
.cache_changed
= 0;
979 ctx
->argv
+= ctx
->argc
- 1;
984 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
986 int newfd
, entries
, has_errors
= 0, nul_term_line
= 0;
987 enum uc_mode untracked_cache
= UC_UNSPECIFIED
;
988 int read_from_stdin
= 0;
989 int prefix_length
= prefix
? strlen(prefix
) : 0;
990 int preferred_index_format
= 0;
991 char set_executable_bit
= 0;
992 struct refresh_params refresh_args
= {0, &has_errors
};
994 int split_index
= -1;
997 struct lock_file lock_file
= LOCK_INIT
;
998 struct parse_opt_ctx_t ctx
;
999 strbuf_getline_fn getline_fn
;
1000 int parseopt_state
= PARSE_OPT_UNKNOWN
;
1001 struct repository
*r
= the_repository
;
1002 struct option options
[] = {
1003 OPT_BIT('q', NULL
, &refresh_args
.flags
,
1004 N_("continue refresh even when index needs update"),
1006 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
1007 N_("refresh: ignore submodules"),
1008 REFRESH_IGNORE_SUBMODULES
),
1009 OPT_SET_INT(0, "add", &allow_add
,
1010 N_("do not ignore new files"), 1),
1011 OPT_SET_INT(0, "replace", &allow_replace
,
1012 N_("let files replace directories and vice-versa"), 1),
1013 OPT_SET_INT(0, "remove", &allow_remove
,
1014 N_("notice files missing from worktree"), 1),
1015 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
1016 N_("refresh even if index contains unmerged entries"),
1018 OPT_CALLBACK_F(0, "refresh", &refresh_args
, NULL
,
1019 N_("refresh stat information"),
1020 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1022 OPT_CALLBACK_F(0, "really-refresh", &refresh_args
, NULL
,
1023 N_("like --refresh, but ignore assume-unchanged setting"),
1024 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1025 really_refresh_callback
),
1026 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
1027 N_("<mode>,<object>,<path>"),
1028 N_("add the specified entry to the index"),
1029 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
1030 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
1032 cacheinfo_callback
},
1033 OPT_CALLBACK_F(0, "chmod", &set_executable_bit
, "(+|-)x",
1034 N_("override the executable bit of the listed files"),
1037 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
1038 N_("mark files as \"not changing\""),
1039 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1040 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
1041 N_("clear assumed-unchanged bit"),
1042 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1043 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
1044 N_("mark files as \"index-only\""),
1045 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1046 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
1047 N_("clear skip-worktree bit"),
1048 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1049 OPT_BOOL(0, "ignore-skip-worktree-entries", &ignore_skip_worktree_entries
,
1050 N_("do not touch index-only entries")),
1051 OPT_SET_INT(0, "info-only", &info_only
,
1052 N_("add to index only; do not add content to object database"), 1),
1053 OPT_SET_INT(0, "force-remove", &force_remove
,
1054 N_("remove named paths even if present in worktree"), 1),
1055 OPT_BOOL('z', NULL
, &nul_term_line
,
1056 N_("with --stdin: input lines are terminated by null bytes")),
1057 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
1058 N_("read list of paths to be updated from standard input"),
1059 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1060 NULL
, 0, stdin_callback
},
1061 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &nul_term_line
, NULL
,
1062 N_("add entries from standard input to the index"),
1063 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1064 NULL
, 0, stdin_cacheinfo_callback
},
1065 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
1066 N_("repopulate stages #2 and #3 for the listed paths"),
1067 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1068 NULL
, 0, unresolve_callback
},
1069 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
1070 N_("only update entries that differ from HEAD"),
1071 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
1072 NULL
, 0, reupdate_callback
},
1073 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
1074 N_("ignore files missing from worktree"),
1075 REFRESH_IGNORE_MISSING
),
1076 OPT_SET_INT(0, "verbose", &verbose
,
1077 N_("report actions to standard output"), 1),
1078 OPT_CALLBACK_F(0, "clear-resolve-undo", NULL
, NULL
,
1079 N_("(for porcelains) forget saved unresolved conflicts"),
1080 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
1081 resolve_undo_clear_callback
),
1082 OPT_INTEGER(0, "index-version", &preferred_index_format
,
1083 N_("write index in this format")),
1084 OPT_BOOL(0, "split-index", &split_index
,
1085 N_("enable or disable split index")),
1086 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1087 N_("enable/disable untracked cache")),
1088 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache
,
1089 N_("test if the filesystem supports untracked cache"), UC_TEST
),
1090 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1091 N_("enable untracked cache without testing the filesystem"), UC_FORCE
),
1092 OPT_SET_INT(0, "force-write-index", &force_write
,
1093 N_("write out the index even if is not flagged as changed"), 1),
1094 OPT_BOOL(0, "fsmonitor", &fsmonitor
,
1095 N_("enable or disable file system monitor")),
1096 {OPTION_SET_INT
, 0, "fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1097 N_("mark files as fsmonitor valid"),
1098 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
1099 {OPTION_SET_INT
, 0, "no-fsmonitor-valid", &mark_fsmonitor_only
, NULL
,
1100 N_("clear fsmonitor valid bit"),
1101 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
1105 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1106 usage_with_options(update_index_usage
, options
);
1108 git_config(git_default_config
, NULL
);
1110 prepare_repo_settings(r
);
1111 the_repository
->settings
.command_requires_full_index
= 0;
1113 /* we will diagnose later if it turns out that we need to update it */
1114 newfd
= repo_hold_locked_index(the_repository
, &lock_file
, 0);
1118 entries
= repo_read_index(the_repository
);
1120 die("cache corrupted");
1122 the_index
.updated_skipworktree
= 1;
1125 * Custom copy of parse_options() because we want to handle
1126 * filename arguments as they come.
1128 parse_options_start(&ctx
, argc
, argv
, prefix
,
1129 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
1132 * Allow the object layer to optimize adding multiple objects in
1135 begin_odb_transaction();
1137 if (parseopt_state
!= PARSE_OPT_DONE
)
1138 parseopt_state
= parse_options_step(&ctx
, options
,
1139 update_index_usage
);
1142 switch (parseopt_state
) {
1143 case PARSE_OPT_HELP
:
1144 case PARSE_OPT_ERROR
:
1146 case PARSE_OPT_COMPLETE
:
1148 case PARSE_OPT_NON_OPTION
:
1149 case PARSE_OPT_DONE
:
1151 const char *path
= ctx
.argv
[0];
1155 p
= prefix_path(prefix
, prefix_length
, path
);
1157 if (set_executable_bit
)
1158 chmod_path(set_executable_bit
, p
);
1164 case PARSE_OPT_UNKNOWN
:
1165 if (ctx
.argv
[0][1] == '-')
1166 error("unknown option '%s'", ctx
.argv
[0] + 2);
1168 error("unknown switch '%c'", *ctx
.opt
);
1169 usage_with_options(update_index_usage
, options
);
1172 argc
= parse_options_end(&ctx
);
1174 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
1175 if (preferred_index_format
) {
1176 if (preferred_index_format
< INDEX_FORMAT_LB
||
1177 INDEX_FORMAT_UB
< preferred_index_format
)
1178 die("index-version %d not in range: %d..%d",
1179 preferred_index_format
,
1180 INDEX_FORMAT_LB
, INDEX_FORMAT_UB
);
1182 if (the_index
.version
!= preferred_index_format
)
1183 the_index
.cache_changed
|= SOMETHING_CHANGED
;
1184 the_index
.version
= preferred_index_format
;
1187 if (read_from_stdin
) {
1188 struct strbuf buf
= STRBUF_INIT
;
1189 struct strbuf unquoted
= STRBUF_INIT
;
1192 while (getline_fn(&buf
, stdin
) != EOF
) {
1194 if (!nul_term_line
&& buf
.buf
[0] == '"') {
1195 strbuf_reset(&unquoted
);
1196 if (unquote_c_style(&unquoted
, buf
.buf
, NULL
))
1197 die("line is badly quoted");
1198 strbuf_swap(&buf
, &unquoted
);
1200 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
1202 if (set_executable_bit
)
1203 chmod_path(set_executable_bit
, p
);
1206 strbuf_release(&unquoted
);
1207 strbuf_release(&buf
);
1211 * By now we have added all of the new objects
1213 end_odb_transaction();
1215 if (split_index
> 0) {
1216 if (git_config_get_split_index() == 0)
1217 warning(_("core.splitIndex is set to false; "
1218 "remove or change it, if you really want to "
1219 "enable split index"));
1220 if (the_index
.split_index
)
1221 the_index
.cache_changed
|= SPLIT_INDEX_ORDERED
;
1223 add_split_index(&the_index
);
1224 } else if (!split_index
) {
1225 if (git_config_get_split_index() == 1)
1226 warning(_("core.splitIndex is set to true; "
1227 "remove or change it, if you really want to "
1228 "disable split index"));
1229 remove_split_index(&the_index
);
1232 prepare_repo_settings(r
);
1233 switch (untracked_cache
) {
1234 case UC_UNSPECIFIED
:
1237 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_WRITE
)
1238 warning(_("core.untrackedCache is set to true; "
1239 "remove or change it, if you really want to "
1240 "disable the untracked cache"));
1241 remove_untracked_cache(&the_index
);
1242 report(_("Untracked cache disabled"));
1246 return !test_if_untracked_cache_is_supported();
1249 if (r
->settings
.core_untracked_cache
== UNTRACKED_CACHE_REMOVE
)
1250 warning(_("core.untrackedCache is set to false; "
1251 "remove or change it, if you really want to "
1252 "enable the untracked cache"));
1253 add_untracked_cache(&the_index
);
1254 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1257 BUG("bad untracked_cache value: %d", untracked_cache
);
1260 if (fsmonitor
> 0) {
1261 enum fsmonitor_mode fsm_mode
= fsm_settings__get_mode(r
);
1262 enum fsmonitor_reason reason
= fsm_settings__get_reason(r
);
1265 * The user wants to turn on FSMonitor using the command
1266 * line argument. (We don't know (or care) whether that
1267 * is the IPC or HOOK version.)
1269 * Use one of the __get routines to force load the FSMonitor
1270 * config settings into the repo-settings. That will detect
1271 * whether the file system is compatible so that we can stop
1272 * here with a nice error message.
1274 if (reason
> FSMONITOR_REASON_OK
)
1276 fsm_settings__get_incompatible_msg(r
, reason
));
1278 if (fsm_mode
== FSMONITOR_MODE_DISABLED
) {
1279 warning(_("core.fsmonitor is unset; "
1280 "set it if you really want to "
1281 "enable fsmonitor"));
1283 add_fsmonitor(&the_index
);
1284 report(_("fsmonitor enabled"));
1285 } else if (!fsmonitor
) {
1286 enum fsmonitor_mode fsm_mode
= fsm_settings__get_mode(r
);
1287 if (fsm_mode
> FSMONITOR_MODE_DISABLED
)
1288 warning(_("core.fsmonitor is set; "
1289 "remove it if you really want to "
1290 "disable fsmonitor"));
1291 remove_fsmonitor(&the_index
);
1292 report(_("fsmonitor disabled"));
1295 if (the_index
.cache_changed
|| force_write
) {
1297 if (refresh_args
.flags
& REFRESH_QUIET
)
1299 unable_to_lock_die(get_index_file(), lock_error
);
1301 if (write_locked_index(&the_index
, &lock_file
, COMMIT_LOCK
))
1302 die("Unable to write new index file");
1305 rollback_lock_file(&lock_file
);
1307 return has_errors
? 1 : 0;