2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
9 #include "cache-tree.h"
10 #include "tree-walk.h"
13 #include "resolve-undo.h"
14 #include "parse-options.h"
17 #include "split-index.h"
20 * Default to not allowing changes to the list of files. The
21 * tool doesn't actually care, but this makes it harder to add
22 * files to the revision control by mistake by doing something
23 * like "git update-index *" and suddenly having all the object
24 * files be revision controlled.
27 static int allow_remove
;
28 static int allow_replace
;
30 static int force_remove
;
32 static int mark_valid_only
;
33 static int mark_skip_worktree_only
;
36 static struct strbuf mtime_dir
= STRBUF_INIT
;
38 __attribute__((format (printf
, 1, 2)))
39 static void report(const char *fmt
, ...)
52 static void remove_test_directory(void)
55 remove_dir_recursively(&mtime_dir
, 0);
58 static const char *get_mtime_path(const char *path
)
60 static struct strbuf sb
= STRBUF_INIT
;
62 strbuf_addf(&sb
, "%s/%s", mtime_dir
.buf
, path
);
66 static void xmkdir(const char *path
)
68 path
= get_mtime_path(path
);
69 if (mkdir(path
, 0700))
70 die_errno(_("failed to create directory %s"), path
);
73 static int xstat_mtime_dir(struct stat
*st
)
75 if (stat(mtime_dir
.buf
, st
))
76 die_errno(_("failed to stat %s"), mtime_dir
.buf
);
80 static int create_file(const char *path
)
83 path
= get_mtime_path(path
);
84 fd
= open(path
, O_CREAT
| O_RDWR
, 0644);
86 die_errno(_("failed to create file %s"), path
);
90 static void xunlink(const char *path
)
92 path
= get_mtime_path(path
);
94 die_errno(_("failed to delete file %s"), path
);
97 static void xrmdir(const char *path
)
99 path
= get_mtime_path(path
);
101 die_errno(_("failed to delete directory %s"), path
);
104 static void avoid_racy(void)
107 * not use if we could usleep(10) if USE_NSEC is defined. The
108 * field nsec could be there, but the OS could choose to
114 static int test_if_untracked_cache_is_supported(void)
117 struct stat_data base
;
120 strbuf_addstr(&mtime_dir
, "mtime-test-XXXXXX");
121 if (!mkdtemp(mtime_dir
.buf
))
122 die_errno("Could not make temporary directory");
124 fprintf(stderr
, _("Testing "));
125 atexit(remove_test_directory
);
126 xstat_mtime_dir(&st
);
127 fill_stat_data(&base
, &st
);
131 fd
= create_file("newfile");
132 xstat_mtime_dir(&st
);
133 if (!match_stat_data(&base
, &st
)) {
136 fprintf_ln(stderr
,_("directory stat info does not "
137 "change after adding a new file"));
140 fill_stat_data(&base
, &st
);
145 xstat_mtime_dir(&st
);
146 if (!match_stat_data(&base
, &st
)) {
149 fprintf_ln(stderr
, _("directory stat info does not change "
150 "after adding a new directory"));
153 fill_stat_data(&base
, &st
);
157 write_or_die(fd
, "data", 4);
159 xstat_mtime_dir(&st
);
160 if (match_stat_data(&base
, &st
)) {
162 fprintf_ln(stderr
, _("directory stat info changes "
163 "after updating a file"));
169 close(create_file("new-dir/new"));
170 xstat_mtime_dir(&st
);
171 if (match_stat_data(&base
, &st
)) {
173 fprintf_ln(stderr
, _("directory stat info changes after "
174 "adding a file inside subdirectory"));
181 xstat_mtime_dir(&st
);
182 if (!match_stat_data(&base
, &st
)) {
184 fprintf_ln(stderr
, _("directory stat info does not "
185 "change after deleting a file"));
188 fill_stat_data(&base
, &st
);
192 xunlink("new-dir/new");
194 xstat_mtime_dir(&st
);
195 if (!match_stat_data(&base
, &st
)) {
197 fprintf_ln(stderr
, _("directory stat info does not "
198 "change after deleting a directory"));
202 if (rmdir(mtime_dir
.buf
))
203 die_errno(_("failed to delete directory %s"), mtime_dir
.buf
);
204 fprintf_ln(stderr
, _(" OK"));
208 strbuf_release(&mtime_dir
);
212 static int mark_ce_flags(const char *path
, int flag
, int mark
)
214 int namelen
= strlen(path
);
215 int pos
= cache_name_pos(path
, namelen
);
218 active_cache
[pos
]->ce_flags
|= flag
;
220 active_cache
[pos
]->ce_flags
&= ~flag
;
221 active_cache
[pos
]->ce_flags
|= CE_UPDATE_IN_BASE
;
222 cache_tree_invalidate_path(&the_index
, path
);
223 active_cache_changed
|= CE_ENTRY_CHANGED
;
229 static int remove_one_path(const char *path
)
232 return error("%s: does not exist and --remove not passed", path
);
233 if (remove_file_from_cache(path
))
234 return error("%s: cannot remove from the index", path
);
239 * Handle a path that couldn't be lstat'ed. It's either:
240 * - missing file (ENOENT or ENOTDIR). That's ok if we're
241 * supposed to be removing it and the removal actually
243 * - permission error. That's never ok.
245 static int process_lstat_error(const char *path
, int err
)
247 if (err
== ENOENT
|| err
== ENOTDIR
)
248 return remove_one_path(path
);
249 return error("lstat(\"%s\"): %s", path
, strerror(errno
));
252 static int add_one_path(const struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
255 struct cache_entry
*ce
;
257 /* Was the old index entry already up-to-date? */
258 if (old
&& !ce_stage(old
) && !ce_match_stat(old
, st
, 0))
261 size
= cache_entry_size(len
);
262 ce
= xcalloc(1, size
);
263 memcpy(ce
->name
, path
, len
);
264 ce
->ce_flags
= create_ce_flags(0);
265 ce
->ce_namelen
= len
;
266 fill_stat_cache_info(ce
, st
);
267 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
269 if (index_path(ce
->sha1
, path
, st
,
270 info_only
? 0 : HASH_WRITE_OBJECT
)) {
274 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
275 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
276 if (add_cache_entry(ce
, option
))
277 return error("%s: cannot add to the index - missing --add option?", path
);
282 * Handle a path that was a directory. Four cases:
284 * - it's already a gitlink in the index, and we keep it that
285 * way, and update it if we can (if we cannot find the HEAD,
286 * we're going to keep it unchanged in the index!)
288 * - it's a *file* in the index, in which case it should be
289 * removed as a file if removal is allowed, since it doesn't
290 * exist as such any more. If removal isn't allowed, it's
293 * (NOTE! This is old and arguably fairly strange behaviour.
294 * We might want to make this an error unconditionally, and
295 * use "--force-remove" if you actually want to force removal).
297 * - it used to exist as a subdirectory (ie multiple files with
298 * this particular prefix) in the index, in which case it's wrong
299 * to try to update it as a directory.
301 * - it doesn't exist at all in the index, but it is a valid
302 * git directory, and it should be *added* as a gitlink.
304 static int process_directory(const char *path
, int len
, struct stat
*st
)
306 unsigned char sha1
[20];
307 int pos
= cache_name_pos(path
, len
);
309 /* Exact match: file or existing gitlink */
311 const struct cache_entry
*ce
= active_cache
[pos
];
312 if (S_ISGITLINK(ce
->ce_mode
)) {
314 /* Do nothing to the index if there is no HEAD! */
315 if (resolve_gitlink_ref(path
, "HEAD", sha1
) < 0)
318 return add_one_path(ce
, path
, len
, st
);
320 /* Should this be an unconditional error? */
321 return remove_one_path(path
);
324 /* Inexact match: is there perhaps a subdirectory match? */
326 while (pos
< active_nr
) {
327 const struct cache_entry
*ce
= active_cache
[pos
++];
329 if (strncmp(ce
->name
, path
, len
))
331 if (ce
->name
[len
] > '/')
333 if (ce
->name
[len
] < '/')
336 /* Subdirectory match - error out */
337 return error("%s: is a directory - add individual files instead", path
);
340 /* No match - should we add it as a gitlink? */
341 if (!resolve_gitlink_ref(path
, "HEAD", sha1
))
342 return add_one_path(NULL
, path
, len
, st
);
345 return error("%s: is a directory - add files inside instead", path
);
348 static int process_path(const char *path
)
352 const struct cache_entry
*ce
;
355 if (has_symlink_leading_path(path
, len
))
356 return error("'%s' is beyond a symbolic link", path
);
358 pos
= cache_name_pos(path
, len
);
359 ce
= pos
< 0 ? NULL
: active_cache
[pos
];
360 if (ce
&& ce_skip_worktree(ce
)) {
362 * working directory version is assumed "good"
363 * so updating it does not make sense.
364 * On the other hand, removing it from index should work
366 if (allow_remove
&& remove_file_from_cache(path
))
367 return error("%s: cannot remove from the index", path
);
372 * First things first: get the stat information, to decide
373 * what to do about the pathname!
375 if (lstat(path
, &st
) < 0)
376 return process_lstat_error(path
, errno
);
378 if (S_ISDIR(st
.st_mode
))
379 return process_directory(path
, len
, &st
);
381 return add_one_path(ce
, path
, len
, &st
);
384 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
385 const char *path
, int stage
)
387 int size
, len
, option
;
388 struct cache_entry
*ce
;
390 if (!verify_path(path
))
391 return error("Invalid path '%s'", path
);
394 size
= cache_entry_size(len
);
395 ce
= xcalloc(1, size
);
397 hashcpy(ce
->sha1
, sha1
);
398 memcpy(ce
->name
, path
, len
);
399 ce
->ce_flags
= create_ce_flags(stage
);
400 ce
->ce_namelen
= len
;
401 ce
->ce_mode
= create_ce_mode(mode
);
402 if (assume_unchanged
)
403 ce
->ce_flags
|= CE_VALID
;
404 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
405 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
406 if (add_cache_entry(ce
, option
))
407 return error("%s: cannot add to the index - missing --add option?",
409 report("add '%s'", path
);
413 static void chmod_path(int flip
, const char *path
)
416 struct cache_entry
*ce
;
419 pos
= cache_name_pos(path
, strlen(path
));
422 ce
= active_cache
[pos
];
428 ce
->ce_mode
|= 0111; break;
430 ce
->ce_mode
&= ~0111; break;
434 cache_tree_invalidate_path(&the_index
, path
);
435 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
436 active_cache_changed
|= CE_ENTRY_CHANGED
;
437 report("chmod %cx '%s'", flip
, path
);
440 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
443 static void update_one(const char *path
)
445 if (!verify_path(path
)) {
446 fprintf(stderr
, "Ignoring path %s\n", path
);
449 if (mark_valid_only
) {
450 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
451 die("Unable to mark file %s", path
);
454 if (mark_skip_worktree_only
) {
455 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
456 die("Unable to mark file %s", path
);
461 if (remove_file_from_cache(path
))
462 die("git update-index: unable to remove %s", path
);
463 report("remove '%s'", path
);
466 if (process_path(path
))
467 die("Unable to process path %s", path
);
468 report("add '%s'", path
);
471 static void read_index_info(int nul_term_line
)
473 struct strbuf buf
= STRBUF_INIT
;
474 struct strbuf uq
= STRBUF_INIT
;
475 strbuf_getline_fn getline_fn
;
477 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
478 while (getline_fn(&buf
, stdin
) != EOF
) {
481 unsigned char sha1
[20];
486 /* This reads lines formatted in one of three formats:
488 * (1) mode SP sha1 TAB path
489 * The first format is what "git apply --index-info"
490 * reports, and used to reconstruct a partial tree
491 * that is used for phony merge base tree when falling
492 * back on 3-way merge.
494 * (2) mode SP type SP sha1 TAB path
495 * The second format is to stuff "git ls-tree" output
496 * into the index file.
498 * (3) mode SP sha1 SP stage TAB path
499 * This format is to put higher order stages into the
500 * index file and matches "git ls-files --stage" output.
503 ul
= strtoul(buf
.buf
, &ptr
, 8);
504 if (ptr
== buf
.buf
|| *ptr
!= ' '
505 || errno
|| (unsigned int) ul
!= ul
)
509 tab
= strchr(ptr
, '\t');
510 if (!tab
|| tab
- ptr
< 41)
513 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
514 stage
= tab
[-1] - '0';
515 ptr
= tab
+ 1; /* point at the head of path */
516 tab
= tab
- 2; /* point at tail of sha1 */
520 ptr
= tab
+ 1; /* point at the head of path */
523 if (get_sha1_hex(tab
- 40, sha1
) || tab
[-41] != ' ')
527 if (!nul_term_line
&& path_name
[0] == '"') {
529 if (unquote_c_style(&uq
, path_name
, NULL
)) {
530 die("git update-index: bad quoting of path name");
535 if (!verify_path(path_name
)) {
536 fprintf(stderr
, "Ignoring path %s\n", path_name
);
541 /* mode == 0 means there is no such path -- remove */
542 if (remove_file_from_cache(path_name
))
543 die("git update-index: unable to remove %s",
547 /* mode ' ' sha1 '\t' name
548 * ptr[-1] points at tab,
549 * ptr[-41] is at the beginning of sha1
551 ptr
[-42] = ptr
[-1] = 0;
552 if (add_cacheinfo(mode
, sha1
, path_name
, stage
))
553 die("git update-index: unable to update %s",
559 die("malformed index info %s", buf
.buf
);
561 strbuf_release(&buf
);
565 static const char * const update_index_usage
[] = {
566 N_("git update-index [<options>] [--] [<file>...]"),
570 static unsigned char head_sha1
[20];
571 static unsigned char merge_head_sha1
[20];
573 static struct cache_entry
*read_one_ent(const char *which
,
574 unsigned char *ent
, const char *path
,
575 int namelen
, int stage
)
578 unsigned char sha1
[20];
580 struct cache_entry
*ce
;
582 if (get_tree_entry(ent
, path
, sha1
, &mode
)) {
584 error("%s: not in %s branch.", path
, which
);
587 if (mode
== S_IFDIR
) {
589 error("%s: not a blob in %s branch.", path
, which
);
592 size
= cache_entry_size(namelen
);
593 ce
= xcalloc(1, size
);
595 hashcpy(ce
->sha1
, sha1
);
596 memcpy(ce
->name
, path
, namelen
);
597 ce
->ce_flags
= create_ce_flags(stage
);
598 ce
->ce_namelen
= namelen
;
599 ce
->ce_mode
= create_ce_mode(mode
);
603 static int unresolve_one(const char *path
)
605 int namelen
= strlen(path
);
608 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
610 /* See if there is such entry in the index. */
611 pos
= cache_name_pos(path
, namelen
);
614 pos
= unmerge_cache_entry_at(pos
);
615 if (pos
< active_nr
) {
616 const struct cache_entry
*ce
= active_cache
[pos
];
618 ce_namelen(ce
) == namelen
&&
619 !memcmp(ce
->name
, path
, namelen
))
622 /* no resolve-undo information; fall back */
624 /* If there isn't, either it is unmerged, or
625 * resolved as "removed" by mistake. We do not
626 * want to do anything in the former case.
629 if (pos
< active_nr
) {
630 const struct cache_entry
*ce
= active_cache
[pos
];
631 if (ce_namelen(ce
) == namelen
&&
632 !memcmp(ce
->name
, path
, namelen
)) {
634 "%s: skipping still unmerged path.\n",
641 /* Grab blobs from given path from HEAD and MERGE_HEAD,
642 * stuff HEAD version in stage #2,
643 * stuff MERGE_HEAD version in stage #3.
645 ce_2
= read_one_ent("our", head_sha1
, path
, namelen
, 2);
646 ce_3
= read_one_ent("their", merge_head_sha1
, path
, namelen
, 3);
648 if (!ce_2
|| !ce_3
) {
652 if (!hashcmp(ce_2
->sha1
, ce_3
->sha1
) &&
653 ce_2
->ce_mode
== ce_3
->ce_mode
) {
654 fprintf(stderr
, "%s: identical in both, skipping.\n",
659 remove_file_from_cache(path
);
660 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
661 error("%s: cannot add our version to the index.", path
);
665 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
667 error("%s: cannot add their version to the index.", path
);
675 static void read_head_pointers(void)
677 if (read_ref("HEAD", head_sha1
))
678 die("No HEAD -- no initial commit yet?");
679 if (read_ref("MERGE_HEAD", merge_head_sha1
)) {
680 fprintf(stderr
, "Not in the middle of a merge.\n");
685 static int do_unresolve(int ac
, const char **av
,
686 const char *prefix
, int prefix_length
)
691 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
692 * are not doing a merge, so exit with success status.
694 read_head_pointers();
696 for (i
= 1; i
< ac
; i
++) {
697 const char *arg
= av
[i
];
698 char *p
= prefix_path(prefix
, prefix_length
, arg
);
699 err
|= unresolve_one(p
);
705 static int do_reupdate(int ac
, const char **av
,
706 const char *prefix
, int prefix_length
)
708 /* Read HEAD and run update-index on paths that are
709 * merged and already different between index and HEAD.
713 struct pathspec pathspec
;
715 parse_pathspec(&pathspec
, 0,
719 if (read_ref("HEAD", head_sha1
))
720 /* If there is no HEAD, that means it is an initial
721 * commit. Update everything in the index.
725 for (pos
= 0; pos
< active_nr
; pos
++) {
726 const struct cache_entry
*ce
= active_cache
[pos
];
727 struct cache_entry
*old
= NULL
;
731 if (ce_stage(ce
) || !ce_path_match(ce
, &pathspec
, NULL
))
734 old
= read_one_ent(NULL
, head_sha1
,
735 ce
->name
, ce_namelen(ce
), 0);
736 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
737 !hashcmp(ce
->sha1
, old
->sha1
)) {
739 continue; /* unchanged */
741 /* Be careful. The working tree may not have the
742 * path anymore, in which case, under 'allow_remove',
743 * or worse yet 'allow_replace', active_nr may decrease.
746 path
= xstrdup(ce
->name
);
750 if (save_nr
!= active_nr
)
753 free_pathspec(&pathspec
);
757 struct refresh_params
{
762 static int refresh(struct refresh_params
*o
, unsigned int flag
)
765 read_cache_preload(NULL
);
766 *o
->has_errors
|= refresh_cache(o
->flags
| flag
);
770 static int refresh_callback(const struct option
*opt
,
771 const char *arg
, int unset
)
773 return refresh(opt
->value
, 0);
776 static int really_refresh_callback(const struct option
*opt
,
777 const char *arg
, int unset
)
779 return refresh(opt
->value
, REFRESH_REALLY
);
782 static int chmod_callback(const struct option
*opt
,
783 const char *arg
, int unset
)
785 char *flip
= opt
->value
;
786 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
787 return error("option 'chmod' expects \"+x\" or \"-x\"");
792 static int resolve_undo_clear_callback(const struct option
*opt
,
793 const char *arg
, int unset
)
795 resolve_undo_clear();
799 static int parse_new_style_cacheinfo(const char *arg
,
801 unsigned char sha1
[],
811 ul
= strtoul(arg
, &endp
, 8);
812 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
813 return -1; /* not a new-style cacheinfo */
816 if (get_sha1_hex(endp
, sha1
) || endp
[40] != ',')
822 static int cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
823 const struct option
*opt
, int unset
)
825 unsigned char sha1
[20];
829 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, sha1
, &path
)) {
830 if (add_cacheinfo(mode
, sha1
, path
, 0))
831 die("git update-index: --cacheinfo cannot add %s", path
);
837 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
838 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
839 get_sha1_hex(*++ctx
->argv
, sha1
) ||
840 add_cacheinfo(mode
, sha1
, *++ctx
->argv
, 0))
841 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
846 static int stdin_cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
847 const struct option
*opt
, int unset
)
849 int *nul_term_line
= opt
->value
;
852 return error("option '%s' must be the last argument", opt
->long_name
);
853 allow_add
= allow_replace
= allow_remove
= 1;
854 read_index_info(*nul_term_line
);
858 static int stdin_callback(struct parse_opt_ctx_t
*ctx
,
859 const struct option
*opt
, int unset
)
861 int *read_from_stdin
= opt
->value
;
864 return error("option '%s' must be the last argument", opt
->long_name
);
865 *read_from_stdin
= 1;
869 static int unresolve_callback(struct parse_opt_ctx_t
*ctx
,
870 const struct option
*opt
, int flags
)
872 int *has_errors
= opt
->value
;
873 const char *prefix
= startup_info
->prefix
;
875 /* consume remaining arguments. */
876 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
877 prefix
, prefix
? strlen(prefix
) : 0);
879 active_cache_changed
= 0;
881 ctx
->argv
+= ctx
->argc
- 1;
886 static int reupdate_callback(struct parse_opt_ctx_t
*ctx
,
887 const struct option
*opt
, int flags
)
889 int *has_errors
= opt
->value
;
890 const char *prefix
= startup_info
->prefix
;
892 /* consume remaining arguments. */
894 *has_errors
= do_reupdate(ctx
->argc
, ctx
->argv
,
895 prefix
, prefix
? strlen(prefix
) : 0);
897 active_cache_changed
= 0;
899 ctx
->argv
+= ctx
->argc
- 1;
904 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
906 int newfd
, entries
, has_errors
= 0, nul_term_line
= 0;
907 int untracked_cache
= -1;
908 int read_from_stdin
= 0;
909 int prefix_length
= prefix
? strlen(prefix
) : 0;
910 int preferred_index_format
= 0;
911 char set_executable_bit
= 0;
912 struct refresh_params refresh_args
= {0, &has_errors
};
914 int split_index
= -1;
915 struct lock_file
*lock_file
;
916 struct parse_opt_ctx_t ctx
;
917 strbuf_getline_fn getline_fn
;
918 int parseopt_state
= PARSE_OPT_UNKNOWN
;
919 struct option options
[] = {
920 OPT_BIT('q', NULL
, &refresh_args
.flags
,
921 N_("continue refresh even when index needs update"),
923 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
924 N_("refresh: ignore submodules"),
925 REFRESH_IGNORE_SUBMODULES
),
926 OPT_SET_INT(0, "add", &allow_add
,
927 N_("do not ignore new files"), 1),
928 OPT_SET_INT(0, "replace", &allow_replace
,
929 N_("let files replace directories and vice-versa"), 1),
930 OPT_SET_INT(0, "remove", &allow_remove
,
931 N_("notice files missing from worktree"), 1),
932 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
933 N_("refresh even if index contains unmerged entries"),
935 {OPTION_CALLBACK
, 0, "refresh", &refresh_args
, NULL
,
936 N_("refresh stat information"),
937 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
939 {OPTION_CALLBACK
, 0, "really-refresh", &refresh_args
, NULL
,
940 N_("like --refresh, but ignore assume-unchanged setting"),
941 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
942 really_refresh_callback
},
943 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
944 N_("<mode>,<object>,<path>"),
945 N_("add the specified entry to the index"),
946 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
947 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
948 (parse_opt_cb
*) cacheinfo_callback
},
949 {OPTION_CALLBACK
, 0, "chmod", &set_executable_bit
, N_("(+/-)x"),
950 N_("override the executable bit of the listed files"),
951 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
953 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
954 N_("mark files as \"not changing\""),
955 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
956 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
957 N_("clear assumed-unchanged bit"),
958 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
959 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
960 N_("mark files as \"index-only\""),
961 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
962 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
963 N_("clear skip-worktree bit"),
964 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
965 OPT_SET_INT(0, "info-only", &info_only
,
966 N_("add to index only; do not add content to object database"), 1),
967 OPT_SET_INT(0, "force-remove", &force_remove
,
968 N_("remove named paths even if present in worktree"), 1),
969 OPT_BOOL('z', NULL
, &nul_term_line
,
970 N_("with --stdin: input lines are terminated by null bytes")),
971 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
972 N_("read list of paths to be updated from standard input"),
973 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
974 (parse_opt_cb
*) stdin_callback
},
975 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &nul_term_line
, NULL
,
976 N_("add entries from standard input to the index"),
977 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
978 (parse_opt_cb
*) stdin_cacheinfo_callback
},
979 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
980 N_("repopulate stages #2 and #3 for the listed paths"),
981 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
982 (parse_opt_cb
*) unresolve_callback
},
983 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
984 N_("only update entries that differ from HEAD"),
985 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
986 (parse_opt_cb
*) reupdate_callback
},
987 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
988 N_("ignore files missing from worktree"),
989 REFRESH_IGNORE_MISSING
),
990 OPT_SET_INT(0, "verbose", &verbose
,
991 N_("report actions to standard output"), 1),
992 {OPTION_CALLBACK
, 0, "clear-resolve-undo", NULL
, NULL
,
993 N_("(for porcelains) forget saved unresolved conflicts"),
994 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
995 resolve_undo_clear_callback
},
996 OPT_INTEGER(0, "index-version", &preferred_index_format
,
997 N_("write index in this format")),
998 OPT_BOOL(0, "split-index", &split_index
,
999 N_("enable or disable split index")),
1000 OPT_BOOL(0, "untracked-cache", &untracked_cache
,
1001 N_("enable/disable untracked cache")),
1002 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache
,
1003 N_("enable untracked cache without testing the filesystem"), 2),
1007 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1008 usage_with_options(update_index_usage
, options
);
1010 git_config(git_default_config
, NULL
);
1012 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
1013 lock_file
= xcalloc(1, sizeof(struct lock_file
));
1015 newfd
= hold_locked_index(lock_file
, 0);
1019 entries
= read_cache();
1021 die("cache corrupted");
1024 * Custom copy of parse_options() because we want to handle
1025 * filename arguments as they come.
1027 parse_options_start(&ctx
, argc
, argv
, prefix
,
1028 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
1030 if (parseopt_state
!= PARSE_OPT_DONE
)
1031 parseopt_state
= parse_options_step(&ctx
, options
,
1032 update_index_usage
);
1035 switch (parseopt_state
) {
1036 case PARSE_OPT_HELP
:
1038 case PARSE_OPT_NON_OPTION
:
1039 case PARSE_OPT_DONE
:
1041 const char *path
= ctx
.argv
[0];
1045 p
= prefix_path(prefix
, prefix_length
, path
);
1047 if (set_executable_bit
)
1048 chmod_path(set_executable_bit
, p
);
1054 case PARSE_OPT_UNKNOWN
:
1055 if (ctx
.argv
[0][1] == '-')
1056 error("unknown option '%s'", ctx
.argv
[0] + 2);
1058 error("unknown switch '%c'", *ctx
.opt
);
1059 usage_with_options(update_index_usage
, options
);
1062 argc
= parse_options_end(&ctx
);
1064 getline_fn
= nul_term_line
? strbuf_getline_nul
: strbuf_getline_lf
;
1065 if (preferred_index_format
) {
1066 if (preferred_index_format
< INDEX_FORMAT_LB
||
1067 INDEX_FORMAT_UB
< preferred_index_format
)
1068 die("index-version %d not in range: %d..%d",
1069 preferred_index_format
,
1070 INDEX_FORMAT_LB
, INDEX_FORMAT_UB
);
1072 if (the_index
.version
!= preferred_index_format
)
1073 active_cache_changed
|= SOMETHING_CHANGED
;
1074 the_index
.version
= preferred_index_format
;
1077 if (read_from_stdin
) {
1078 struct strbuf buf
= STRBUF_INIT
, nbuf
= STRBUF_INIT
;
1081 while (getline_fn(&buf
, stdin
) != EOF
) {
1083 if (!nul_term_line
&& buf
.buf
[0] == '"') {
1084 strbuf_reset(&nbuf
);
1085 if (unquote_c_style(&nbuf
, buf
.buf
, NULL
))
1086 die("line is badly quoted");
1087 strbuf_swap(&buf
, &nbuf
);
1089 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
1091 if (set_executable_bit
)
1092 chmod_path(set_executable_bit
, p
);
1095 strbuf_release(&nbuf
);
1096 strbuf_release(&buf
);
1099 if (split_index
> 0) {
1100 init_split_index(&the_index
);
1101 the_index
.cache_changed
|= SPLIT_INDEX_ORDERED
;
1102 } else if (!split_index
&& the_index
.split_index
) {
1104 * can't discard_split_index(&the_index); because that
1105 * will destroy split_index->base->cache[], which may
1106 * be shared with the_index.cache[]. So yeah we're
1107 * leaking a bit here.
1109 the_index
.split_index
= NULL
;
1110 the_index
.cache_changed
|= SOMETHING_CHANGED
;
1112 if (untracked_cache
> 0) {
1113 struct untracked_cache
*uc
;
1115 if (untracked_cache
< 2) {
1117 if (!test_if_untracked_cache_is_supported())
1120 if (!the_index
.untracked
) {
1121 uc
= xcalloc(1, sizeof(*uc
));
1122 strbuf_init(&uc
->ident
, 100);
1123 uc
->exclude_per_dir
= ".gitignore";
1124 /* should be the same flags used by git-status */
1125 uc
->dir_flags
= DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
1126 the_index
.untracked
= uc
;
1128 add_untracked_ident(the_index
.untracked
);
1129 the_index
.cache_changed
|= UNTRACKED_CHANGED
;
1130 } else if (!untracked_cache
&& the_index
.untracked
) {
1131 the_index
.untracked
= NULL
;
1132 the_index
.cache_changed
|= UNTRACKED_CHANGED
;
1135 if (active_cache_changed
) {
1137 if (refresh_args
.flags
& REFRESH_QUIET
)
1139 unable_to_lock_die(get_index_file(), lock_error
);
1141 if (write_locked_index(&the_index
, lock_file
, COMMIT_LOCK
))
1142 die("Unable to write new index file");
1145 rollback_lock_file(lock_file
);
1147 return has_errors
? 1 : 0;