am: Use cat instead of echo to avoid DOS line-endings (fixes t4150)
[git/mingw/4msysgit.git] / builtin / update-index.c
blobaaa6f78f1629311257291ba1075ddd7c7dd1a3ed
1 /*
2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
5 */
6 #include "cache.h"
7 #include "quote.h"
8 #include "cache-tree.h"
9 #include "tree-walk.h"
10 #include "builtin.h"
11 #include "refs.h"
12 #include "resolve-undo.h"
13 #include "parse-options.h"
14 #include "pathspec.h"
15 #include "dir.h"
18 * Default to not allowing changes to the list of files. The
19 * tool doesn't actually care, but this makes it harder to add
20 * files to the revision control by mistake by doing something
21 * like "git update-index *" and suddenly having all the object
22 * files be revision controlled.
24 static int allow_add;
25 static int allow_remove;
26 static int allow_replace;
27 static int info_only;
28 static int force_remove;
29 static int verbose;
30 static int mark_valid_only;
31 static int mark_skip_worktree_only;
32 #define MARK_FLAG 1
33 #define UNMARK_FLAG 2
35 __attribute__((format (printf, 1, 2)))
36 static void report(const char *fmt, ...)
38 va_list vp;
40 if (!verbose)
41 return;
43 va_start(vp, fmt);
44 vprintf(fmt, vp);
45 putchar('\n');
46 va_end(vp);
49 static int mark_ce_flags(const char *path, int flag, int mark)
51 int namelen = strlen(path);
52 int pos = cache_name_pos(path, namelen);
53 if (0 <= pos) {
54 if (mark)
55 active_cache[pos]->ce_flags |= flag;
56 else
57 active_cache[pos]->ce_flags &= ~flag;
58 cache_tree_invalidate_path(active_cache_tree, path);
59 active_cache_changed = 1;
60 return 0;
62 return -1;
65 static int remove_one_path(const char *path)
67 if (!allow_remove)
68 return error("%s: does not exist and --remove not passed", path);
69 if (remove_file_from_cache(path))
70 return error("%s: cannot remove from the index", path);
71 return 0;
75 * Handle a path that couldn't be lstat'ed. It's either:
76 * - missing file (ENOENT or ENOTDIR). That's ok if we're
77 * supposed to be removing it and the removal actually
78 * succeeds.
79 * - permission error. That's never ok.
81 static int process_lstat_error(const char *path, int err)
83 if (err == ENOENT || err == ENOTDIR)
84 return remove_one_path(path);
85 return error("lstat(\"%s\"): %s", path, strerror(errno));
88 static int add_one_path(const struct cache_entry *old, const char *path, int len, struct stat *st)
90 int option, size;
91 struct cache_entry *ce;
93 /* Was the old index entry already up-to-date? */
94 if (old && !ce_stage(old) && !ce_match_stat(old, st, 0))
95 return 0;
97 size = cache_entry_size(len);
98 ce = xcalloc(1, size);
99 memcpy(ce->name, path, len);
100 ce->ce_flags = create_ce_flags(0);
101 ce->ce_namelen = len;
102 fill_stat_cache_info(ce, st);
103 ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
105 if (index_path(ce->sha1, path, st,
106 info_only ? 0 : HASH_WRITE_OBJECT)) {
107 free(ce);
108 return -1;
110 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
111 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
112 if (add_cache_entry(ce, option))
113 return error("%s: cannot add to the index - missing --add option?", path);
114 return 0;
118 * Handle a path that was a directory. Four cases:
120 * - it's already a gitlink in the index, and we keep it that
121 * way, and update it if we can (if we cannot find the HEAD,
122 * we're going to keep it unchanged in the index!)
124 * - it's a *file* in the index, in which case it should be
125 * removed as a file if removal is allowed, since it doesn't
126 * exist as such any more. If removal isn't allowed, it's
127 * an error.
129 * (NOTE! This is old and arguably fairly strange behaviour.
130 * We might want to make this an error unconditionally, and
131 * use "--force-remove" if you actually want to force removal).
133 * - it used to exist as a subdirectory (ie multiple files with
134 * this particular prefix) in the index, in which case it's wrong
135 * to try to update it as a directory.
137 * - it doesn't exist at all in the index, but it is a valid
138 * git directory, and it should be *added* as a gitlink.
140 static int process_directory(const char *path, int len, struct stat *st)
142 unsigned char sha1[20];
143 int pos = cache_name_pos(path, len);
145 /* Exact match: file or existing gitlink */
146 if (pos >= 0) {
147 const struct cache_entry *ce = active_cache[pos];
148 if (S_ISGITLINK(ce->ce_mode)) {
150 /* Do nothing to the index if there is no HEAD! */
151 if (resolve_gitlink_ref(path, "HEAD", sha1) < 0)
152 return 0;
154 return add_one_path(ce, path, len, st);
156 /* Should this be an unconditional error? */
157 return remove_one_path(path);
160 /* Inexact match: is there perhaps a subdirectory match? */
161 pos = -pos-1;
162 while (pos < active_nr) {
163 const struct cache_entry *ce = active_cache[pos++];
165 if (strncmp(ce->name, path, len))
166 break;
167 if (ce->name[len] > '/')
168 break;
169 if (ce->name[len] < '/')
170 continue;
172 /* Subdirectory match - error out */
173 return error("%s: is a directory - add individual files instead", path);
176 /* No match - should we add it as a gitlink? */
177 if (!resolve_gitlink_ref(path, "HEAD", sha1))
178 return add_one_path(NULL, path, len, st);
180 /* Error out. */
181 return error("%s: is a directory - add files inside instead", path);
184 static int process_path(const char *path)
186 int pos, len;
187 struct stat st;
188 const struct cache_entry *ce;
190 len = strlen(path);
191 if (has_symlink_leading_path(path, len))
192 return error("'%s' is beyond a symbolic link", path);
194 pos = cache_name_pos(path, len);
195 ce = pos < 0 ? NULL : active_cache[pos];
196 if (ce && ce_skip_worktree(ce)) {
198 * working directory version is assumed "good"
199 * so updating it does not make sense.
200 * On the other hand, removing it from index should work
202 if (allow_remove && remove_file_from_cache(path))
203 return error("%s: cannot remove from the index", path);
204 return 0;
208 * First things first: get the stat information, to decide
209 * what to do about the pathname!
211 if (lstat(path, &st) < 0)
212 return process_lstat_error(path, errno);
214 if (S_ISDIR(st.st_mode))
215 return process_directory(path, len, &st);
217 return add_one_path(ce, path, len, &st);
220 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
221 const char *path, int stage)
223 int size, len, option;
224 struct cache_entry *ce;
226 if (!verify_path(path))
227 return error("Invalid path '%s'", path);
229 len = strlen(path);
230 size = cache_entry_size(len);
231 ce = xcalloc(1, size);
233 hashcpy(ce->sha1, sha1);
234 memcpy(ce->name, path, len);
235 ce->ce_flags = create_ce_flags(stage);
236 ce->ce_namelen = len;
237 ce->ce_mode = create_ce_mode(mode);
238 if (assume_unchanged)
239 ce->ce_flags |= CE_VALID;
240 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
241 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
242 if (add_cache_entry(ce, option))
243 return error("%s: cannot add to the index - missing --add option?",
244 path);
245 report("add '%s'", path);
246 return 0;
249 static void chmod_path(int flip, const char *path)
251 int pos;
252 struct cache_entry *ce;
253 unsigned int mode;
255 pos = cache_name_pos(path, strlen(path));
256 if (pos < 0)
257 goto fail;
258 ce = active_cache[pos];
259 mode = ce->ce_mode;
260 if (!S_ISREG(mode))
261 goto fail;
262 switch (flip) {
263 case '+':
264 ce->ce_mode |= 0111; break;
265 case '-':
266 ce->ce_mode &= ~0111; break;
267 default:
268 goto fail;
270 cache_tree_invalidate_path(active_cache_tree, path);
271 active_cache_changed = 1;
272 report("chmod %cx '%s'", flip, path);
273 return;
274 fail:
275 die("git update-index: cannot chmod %cx '%s'", flip, path);
278 static void update_one(const char *path, const char *prefix, int prefix_length)
280 const char *p = prefix_path(prefix, prefix_length, path);
281 if (!verify_path(p)) {
282 fprintf(stderr, "Ignoring path %s\n", path);
283 goto free_return;
285 if (mark_valid_only) {
286 if (mark_ce_flags(p, CE_VALID, mark_valid_only == MARK_FLAG))
287 die("Unable to mark file %s", path);
288 goto free_return;
290 if (mark_skip_worktree_only) {
291 if (mark_ce_flags(p, CE_SKIP_WORKTREE, mark_skip_worktree_only == MARK_FLAG))
292 die("Unable to mark file %s", path);
293 goto free_return;
296 if (force_remove) {
297 if (remove_file_from_cache(p))
298 die("git update-index: unable to remove %s", path);
299 report("remove '%s'", path);
300 goto free_return;
302 if (process_path(p))
303 die("Unable to process path %s", path);
304 report("add '%s'", path);
305 free_return:
306 if (p < path || p > path + strlen(path))
307 free((char *)p);
310 static void read_index_info(int line_termination)
312 struct strbuf buf = STRBUF_INIT;
313 struct strbuf uq = STRBUF_INIT;
315 while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
316 char *ptr, *tab;
317 char *path_name;
318 unsigned char sha1[20];
319 unsigned int mode;
320 unsigned long ul;
321 int stage;
323 /* This reads lines formatted in one of three formats:
325 * (1) mode SP sha1 TAB path
326 * The first format is what "git apply --index-info"
327 * reports, and used to reconstruct a partial tree
328 * that is used for phony merge base tree when falling
329 * back on 3-way merge.
331 * (2) mode SP type SP sha1 TAB path
332 * The second format is to stuff "git ls-tree" output
333 * into the index file.
335 * (3) mode SP sha1 SP stage TAB path
336 * This format is to put higher order stages into the
337 * index file and matches "git ls-files --stage" output.
339 errno = 0;
340 ul = strtoul(buf.buf, &ptr, 8);
341 if (ptr == buf.buf || *ptr != ' '
342 || errno || (unsigned int) ul != ul)
343 goto bad_line;
344 mode = ul;
346 tab = strchr(ptr, '\t');
347 if (!tab || tab - ptr < 41)
348 goto bad_line;
350 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
351 stage = tab[-1] - '0';
352 ptr = tab + 1; /* point at the head of path */
353 tab = tab - 2; /* point at tail of sha1 */
355 else {
356 stage = 0;
357 ptr = tab + 1; /* point at the head of path */
360 if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
361 goto bad_line;
363 path_name = ptr;
364 if (line_termination && path_name[0] == '"') {
365 strbuf_reset(&uq);
366 if (unquote_c_style(&uq, path_name, NULL)) {
367 die("git update-index: bad quoting of path name");
369 path_name = uq.buf;
372 if (!verify_path(path_name)) {
373 fprintf(stderr, "Ignoring path %s\n", path_name);
374 continue;
377 if (!mode) {
378 /* mode == 0 means there is no such path -- remove */
379 if (remove_file_from_cache(path_name))
380 die("git update-index: unable to remove %s",
381 ptr);
383 else {
384 /* mode ' ' sha1 '\t' name
385 * ptr[-1] points at tab,
386 * ptr[-41] is at the beginning of sha1
388 ptr[-42] = ptr[-1] = 0;
389 if (add_cacheinfo(mode, sha1, path_name, stage))
390 die("git update-index: unable to update %s",
391 path_name);
393 continue;
395 bad_line:
396 die("malformed index info %s", buf.buf);
398 strbuf_release(&buf);
399 strbuf_release(&uq);
402 static const char * const update_index_usage[] = {
403 N_("git update-index [options] [--] [<file>...]"),
404 NULL
407 static unsigned char head_sha1[20];
408 static unsigned char merge_head_sha1[20];
410 static struct cache_entry *read_one_ent(const char *which,
411 unsigned char *ent, const char *path,
412 int namelen, int stage)
414 unsigned mode;
415 unsigned char sha1[20];
416 int size;
417 struct cache_entry *ce;
419 if (get_tree_entry(ent, path, sha1, &mode)) {
420 if (which)
421 error("%s: not in %s branch.", path, which);
422 return NULL;
424 if (mode == S_IFDIR) {
425 if (which)
426 error("%s: not a blob in %s branch.", path, which);
427 return NULL;
429 size = cache_entry_size(namelen);
430 ce = xcalloc(1, size);
432 hashcpy(ce->sha1, sha1);
433 memcpy(ce->name, path, namelen);
434 ce->ce_flags = create_ce_flags(stage);
435 ce->ce_namelen = namelen;
436 ce->ce_mode = create_ce_mode(mode);
437 return ce;
440 static int unresolve_one(const char *path)
442 int namelen = strlen(path);
443 int pos;
444 int ret = 0;
445 struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
447 /* See if there is such entry in the index. */
448 pos = cache_name_pos(path, namelen);
449 if (0 <= pos) {
450 /* already merged */
451 pos = unmerge_cache_entry_at(pos);
452 if (pos < active_nr) {
453 const struct cache_entry *ce = active_cache[pos];
454 if (ce_stage(ce) &&
455 ce_namelen(ce) == namelen &&
456 !memcmp(ce->name, path, namelen))
457 return 0;
459 /* no resolve-undo information; fall back */
460 } else {
461 /* If there isn't, either it is unmerged, or
462 * resolved as "removed" by mistake. We do not
463 * want to do anything in the former case.
465 pos = -pos-1;
466 if (pos < active_nr) {
467 const struct cache_entry *ce = active_cache[pos];
468 if (ce_namelen(ce) == namelen &&
469 !memcmp(ce->name, path, namelen)) {
470 fprintf(stderr,
471 "%s: skipping still unmerged path.\n",
472 path);
473 goto free_return;
478 /* Grab blobs from given path from HEAD and MERGE_HEAD,
479 * stuff HEAD version in stage #2,
480 * stuff MERGE_HEAD version in stage #3.
482 ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
483 ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
485 if (!ce_2 || !ce_3) {
486 ret = -1;
487 goto free_return;
489 if (!hashcmp(ce_2->sha1, ce_3->sha1) &&
490 ce_2->ce_mode == ce_3->ce_mode) {
491 fprintf(stderr, "%s: identical in both, skipping.\n",
492 path);
493 goto free_return;
496 remove_file_from_cache(path);
497 if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
498 error("%s: cannot add our version to the index.", path);
499 ret = -1;
500 goto free_return;
502 if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
503 return 0;
504 error("%s: cannot add their version to the index.", path);
505 ret = -1;
506 free_return:
507 free(ce_2);
508 free(ce_3);
509 return ret;
512 static void read_head_pointers(void)
514 if (read_ref("HEAD", head_sha1))
515 die("No HEAD -- no initial commit yet?");
516 if (read_ref("MERGE_HEAD", merge_head_sha1)) {
517 fprintf(stderr, "Not in the middle of a merge.\n");
518 exit(0);
522 static int do_unresolve(int ac, const char **av,
523 const char *prefix, int prefix_length)
525 int i;
526 int err = 0;
528 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
529 * are not doing a merge, so exit with success status.
531 read_head_pointers();
533 for (i = 1; i < ac; i++) {
534 const char *arg = av[i];
535 const char *p = prefix_path(prefix, prefix_length, arg);
536 err |= unresolve_one(p);
537 if (p < arg || p > arg + strlen(arg))
538 free((char *)p);
540 return err;
543 static int do_reupdate(int ac, const char **av,
544 const char *prefix, int prefix_length)
546 /* Read HEAD and run update-index on paths that are
547 * merged and already different between index and HEAD.
549 int pos;
550 int has_head = 1;
551 struct pathspec pathspec;
553 parse_pathspec(&pathspec, 0,
554 PATHSPEC_PREFER_CWD,
555 prefix, av + 1);
557 if (read_ref("HEAD", head_sha1))
558 /* If there is no HEAD, that means it is an initial
559 * commit. Update everything in the index.
561 has_head = 0;
562 redo:
563 for (pos = 0; pos < active_nr; pos++) {
564 const struct cache_entry *ce = active_cache[pos];
565 struct cache_entry *old = NULL;
566 int save_nr;
568 if (ce_stage(ce) || !ce_path_match(ce, &pathspec, NULL))
569 continue;
570 if (has_head)
571 old = read_one_ent(NULL, head_sha1,
572 ce->name, ce_namelen(ce), 0);
573 if (old && ce->ce_mode == old->ce_mode &&
574 !hashcmp(ce->sha1, old->sha1)) {
575 free(old);
576 continue; /* unchanged */
578 /* Be careful. The working tree may not have the
579 * path anymore, in which case, under 'allow_remove',
580 * or worse yet 'allow_replace', active_nr may decrease.
582 save_nr = active_nr;
583 update_one(ce->name + prefix_length, prefix, prefix_length);
584 if (save_nr != active_nr)
585 goto redo;
587 free_pathspec(&pathspec);
588 return 0;
591 struct refresh_params {
592 unsigned int flags;
593 int *has_errors;
596 static int refresh(struct refresh_params *o, unsigned int flag)
598 setup_work_tree();
599 read_cache_preload(NULL);
600 *o->has_errors |= refresh_cache(o->flags | flag);
601 return 0;
604 static int refresh_callback(const struct option *opt,
605 const char *arg, int unset)
607 return refresh(opt->value, 0);
610 static int really_refresh_callback(const struct option *opt,
611 const char *arg, int unset)
613 return refresh(opt->value, REFRESH_REALLY);
616 static int chmod_callback(const struct option *opt,
617 const char *arg, int unset)
619 char *flip = opt->value;
620 if ((arg[0] != '-' && arg[0] != '+') || arg[1] != 'x' || arg[2])
621 return error("option 'chmod' expects \"+x\" or \"-x\"");
622 *flip = arg[0];
623 return 0;
626 static int resolve_undo_clear_callback(const struct option *opt,
627 const char *arg, int unset)
629 resolve_undo_clear();
630 return 0;
633 static int cacheinfo_callback(struct parse_opt_ctx_t *ctx,
634 const struct option *opt, int unset)
636 unsigned char sha1[20];
637 unsigned int mode;
639 if (ctx->argc <= 3)
640 return error("option 'cacheinfo' expects three arguments");
641 if (strtoul_ui(*++ctx->argv, 8, &mode) ||
642 get_sha1_hex(*++ctx->argv, sha1) ||
643 add_cacheinfo(mode, sha1, *++ctx->argv, 0))
644 die("git update-index: --cacheinfo cannot add %s", *ctx->argv);
645 ctx->argc -= 3;
646 return 0;
649 static int stdin_cacheinfo_callback(struct parse_opt_ctx_t *ctx,
650 const struct option *opt, int unset)
652 int *line_termination = opt->value;
654 if (ctx->argc != 1)
655 return error("option '%s' must be the last argument", opt->long_name);
656 allow_add = allow_replace = allow_remove = 1;
657 read_index_info(*line_termination);
658 return 0;
661 static int stdin_callback(struct parse_opt_ctx_t *ctx,
662 const struct option *opt, int unset)
664 int *read_from_stdin = opt->value;
666 if (ctx->argc != 1)
667 return error("option '%s' must be the last argument", opt->long_name);
668 *read_from_stdin = 1;
669 return 0;
672 static int unresolve_callback(struct parse_opt_ctx_t *ctx,
673 const struct option *opt, int flags)
675 int *has_errors = opt->value;
676 const char *prefix = startup_info->prefix;
678 /* consume remaining arguments. */
679 *has_errors = do_unresolve(ctx->argc, ctx->argv,
680 prefix, prefix ? strlen(prefix) : 0);
681 if (*has_errors)
682 active_cache_changed = 0;
684 ctx->argv += ctx->argc - 1;
685 ctx->argc = 1;
686 return 0;
689 static int reupdate_callback(struct parse_opt_ctx_t *ctx,
690 const struct option *opt, int flags)
692 int *has_errors = opt->value;
693 const char *prefix = startup_info->prefix;
695 /* consume remaining arguments. */
696 setup_work_tree();
697 *has_errors = do_reupdate(ctx->argc, ctx->argv,
698 prefix, prefix ? strlen(prefix) : 0);
699 if (*has_errors)
700 active_cache_changed = 0;
702 ctx->argv += ctx->argc - 1;
703 ctx->argc = 1;
704 return 0;
707 int cmd_update_index(int argc, const char **argv, const char *prefix)
709 int newfd, entries, has_errors = 0, line_termination = '\n';
710 int read_from_stdin = 0;
711 int prefix_length = prefix ? strlen(prefix) : 0;
712 int preferred_index_format = 0;
713 char set_executable_bit = 0;
714 struct refresh_params refresh_args = {0, &has_errors};
715 int lock_error = 0;
716 struct lock_file *lock_file;
717 struct parse_opt_ctx_t ctx;
718 int parseopt_state = PARSE_OPT_UNKNOWN;
719 struct option options[] = {
720 OPT_BIT('q', NULL, &refresh_args.flags,
721 N_("continue refresh even when index needs update"),
722 REFRESH_QUIET),
723 OPT_BIT(0, "ignore-submodules", &refresh_args.flags,
724 N_("refresh: ignore submodules"),
725 REFRESH_IGNORE_SUBMODULES),
726 OPT_SET_INT(0, "add", &allow_add,
727 N_("do not ignore new files"), 1),
728 OPT_SET_INT(0, "replace", &allow_replace,
729 N_("let files replace directories and vice-versa"), 1),
730 OPT_SET_INT(0, "remove", &allow_remove,
731 N_("notice files missing from worktree"), 1),
732 OPT_BIT(0, "unmerged", &refresh_args.flags,
733 N_("refresh even if index contains unmerged entries"),
734 REFRESH_UNMERGED),
735 {OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL,
736 N_("refresh stat information"),
737 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
738 refresh_callback},
739 {OPTION_CALLBACK, 0, "really-refresh", &refresh_args, NULL,
740 N_("like --refresh, but ignore assume-unchanged setting"),
741 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
742 really_refresh_callback},
743 {OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
744 N_("<mode> <object> <path>"),
745 N_("add the specified entry to the index"),
746 PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
747 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
748 (parse_opt_cb *) cacheinfo_callback},
749 {OPTION_CALLBACK, 0, "chmod", &set_executable_bit, N_("(+/-)x"),
750 N_("override the executable bit of the listed files"),
751 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
752 chmod_callback},
753 {OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
754 N_("mark files as \"not changing\""),
755 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
756 {OPTION_SET_INT, 0, "no-assume-unchanged", &mark_valid_only, NULL,
757 N_("clear assumed-unchanged bit"),
758 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
759 {OPTION_SET_INT, 0, "skip-worktree", &mark_skip_worktree_only, NULL,
760 N_("mark files as \"index-only\""),
761 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
762 {OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
763 N_("clear skip-worktree bit"),
764 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
765 OPT_SET_INT(0, "info-only", &info_only,
766 N_("add to index only; do not add content to object database"), 1),
767 OPT_SET_INT(0, "force-remove", &force_remove,
768 N_("remove named paths even if present in worktree"), 1),
769 OPT_SET_INT('z', NULL, &line_termination,
770 N_("with --stdin: input lines are terminated by null bytes"), '\0'),
771 {OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
772 N_("read list of paths to be updated from standard input"),
773 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
774 (parse_opt_cb *) stdin_callback},
775 {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &line_termination, NULL,
776 N_("add entries from standard input to the index"),
777 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
778 (parse_opt_cb *) stdin_cacheinfo_callback},
779 {OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
780 N_("repopulate stages #2 and #3 for the listed paths"),
781 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
782 (parse_opt_cb *) unresolve_callback},
783 {OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
784 N_("only update entries that differ from HEAD"),
785 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
786 (parse_opt_cb *) reupdate_callback},
787 OPT_BIT(0, "ignore-missing", &refresh_args.flags,
788 N_("ignore files missing from worktree"),
789 REFRESH_IGNORE_MISSING),
790 OPT_SET_INT(0, "verbose", &verbose,
791 N_("report actions to standard output"), 1),
792 {OPTION_CALLBACK, 0, "clear-resolve-undo", NULL, NULL,
793 N_("(for porcelains) forget saved unresolved conflicts"),
794 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
795 resolve_undo_clear_callback},
796 OPT_INTEGER(0, "index-version", &preferred_index_format,
797 N_("write index in this format")),
798 OPT_END()
801 if (argc == 2 && !strcmp(argv[1], "-h"))
802 usage_with_options(update_index_usage, options);
804 git_config(git_default_config, NULL);
806 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
807 lock_file = xcalloc(1, sizeof(struct lock_file));
809 newfd = hold_locked_index(lock_file, 0);
810 if (newfd < 0)
811 lock_error = errno;
813 entries = read_cache();
814 if (entries < 0)
815 die("cache corrupted");
818 * Custom copy of parse_options() because we want to handle
819 * filename arguments as they come.
821 parse_options_start(&ctx, argc, argv, prefix,
822 options, PARSE_OPT_STOP_AT_NON_OPTION);
823 while (ctx.argc) {
824 if (parseopt_state != PARSE_OPT_DONE)
825 parseopt_state = parse_options_step(&ctx, options,
826 update_index_usage);
827 if (!ctx.argc)
828 break;
829 switch (parseopt_state) {
830 case PARSE_OPT_HELP:
831 exit(129);
832 case PARSE_OPT_NON_OPTION:
833 case PARSE_OPT_DONE:
835 const char *path = ctx.argv[0];
836 const char *p;
838 setup_work_tree();
839 p = prefix_path(prefix, prefix_length, path);
840 update_one(p, NULL, 0);
841 if (set_executable_bit)
842 chmod_path(set_executable_bit, p);
843 if (p < path || p > path + strlen(path))
844 free((char *)p);
845 ctx.argc--;
846 ctx.argv++;
847 break;
849 case PARSE_OPT_UNKNOWN:
850 if (ctx.argv[0][1] == '-')
851 error("unknown option '%s'", ctx.argv[0] + 2);
852 else
853 error("unknown switch '%c'", *ctx.opt);
854 usage_with_options(update_index_usage, options);
857 argc = parse_options_end(&ctx);
858 if (preferred_index_format) {
859 if (preferred_index_format < INDEX_FORMAT_LB ||
860 INDEX_FORMAT_UB < preferred_index_format)
861 die("index-version %d not in range: %d..%d",
862 preferred_index_format,
863 INDEX_FORMAT_LB, INDEX_FORMAT_UB);
865 if (the_index.version != preferred_index_format)
866 active_cache_changed = 1;
867 the_index.version = preferred_index_format;
870 if (read_from_stdin) {
871 struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
873 setup_work_tree();
874 while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
875 const char *p;
876 if (line_termination && buf.buf[0] == '"') {
877 strbuf_reset(&nbuf);
878 if (unquote_c_style(&nbuf, buf.buf, NULL))
879 die("line is badly quoted");
880 strbuf_swap(&buf, &nbuf);
882 p = prefix_path(prefix, prefix_length, buf.buf);
883 update_one(p, NULL, 0);
884 if (set_executable_bit)
885 chmod_path(set_executable_bit, p);
886 if (p < buf.buf || p > buf.buf + buf.len)
887 free((char *)p);
889 strbuf_release(&nbuf);
890 strbuf_release(&buf);
893 if (active_cache_changed) {
894 if (newfd < 0) {
895 if (refresh_args.flags & REFRESH_QUIET)
896 exit(128);
897 unable_to_lock_index_die(get_index_file(), lock_error);
899 if (write_cache(newfd, active_cache, active_nr) ||
900 commit_locked_index(lock_file))
901 die("Unable to write new index file");
904 rollback_lock_file(lock_file);
906 return has_errors ? 1 : 0;