Sync with 1.7.12.3
[git/jnareb-git.git] / builtin / update-index.c
blob74986bf163d4dadb4497a90364c29ac71a801638
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"
16 * Default to not allowing changes to the list of files. The
17 * tool doesn't actually care, but this makes it harder to add
18 * files to the revision control by mistake by doing something
19 * like "git update-index *" and suddenly having all the object
20 * files be revision controlled.
22 static int allow_add;
23 static int allow_remove;
24 static int allow_replace;
25 static int info_only;
26 static int force_remove;
27 static int verbose;
28 static int mark_valid_only;
29 static int mark_skip_worktree_only;
30 #define MARK_FLAG 1
31 #define UNMARK_FLAG 2
33 __attribute__((format (printf, 1, 2)))
34 static void report(const char *fmt, ...)
36 va_list vp;
38 if (!verbose)
39 return;
41 va_start(vp, fmt);
42 vprintf(fmt, vp);
43 putchar('\n');
44 va_end(vp);
47 static int mark_ce_flags(const char *path, int flag, int mark)
49 int namelen = strlen(path);
50 int pos = cache_name_pos(path, namelen);
51 if (0 <= pos) {
52 if (mark)
53 active_cache[pos]->ce_flags |= flag;
54 else
55 active_cache[pos]->ce_flags &= ~flag;
56 cache_tree_invalidate_path(active_cache_tree, path);
57 active_cache_changed = 1;
58 return 0;
60 return -1;
63 static int remove_one_path(const char *path)
65 if (!allow_remove)
66 return error("%s: does not exist and --remove not passed", path);
67 if (remove_file_from_cache(path))
68 return error("%s: cannot remove from the index", path);
69 return 0;
73 * Handle a path that couldn't be lstat'ed. It's either:
74 * - missing file (ENOENT or ENOTDIR). That's ok if we're
75 * supposed to be removing it and the removal actually
76 * succeeds.
77 * - permission error. That's never ok.
79 static int process_lstat_error(const char *path, int err)
81 if (err == ENOENT || err == ENOTDIR)
82 return remove_one_path(path);
83 return error("lstat(\"%s\"): %s", path, strerror(errno));
86 static int add_one_path(struct cache_entry *old, const char *path, int len, struct stat *st)
88 int option, size;
89 struct cache_entry *ce;
91 /* Was the old index entry already up-to-date? */
92 if (old && !ce_stage(old) && !ce_match_stat(old, st, 0))
93 return 0;
95 size = cache_entry_size(len);
96 ce = xcalloc(1, size);
97 memcpy(ce->name, path, len);
98 ce->ce_flags = create_ce_flags(0);
99 ce->ce_namelen = len;
100 fill_stat_cache_info(ce, st);
101 ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
103 if (index_path(ce->sha1, path, st,
104 info_only ? 0 : HASH_WRITE_OBJECT)) {
105 free(ce);
106 return -1;
108 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
109 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
110 if (add_cache_entry(ce, option))
111 return error("%s: cannot add to the index - missing --add option?", path);
112 return 0;
116 * Handle a path that was a directory. Four cases:
118 * - it's already a gitlink in the index, and we keep it that
119 * way, and update it if we can (if we cannot find the HEAD,
120 * we're going to keep it unchanged in the index!)
122 * - it's a *file* in the index, in which case it should be
123 * removed as a file if removal is allowed, since it doesn't
124 * exist as such any more. If removal isn't allowed, it's
125 * an error.
127 * (NOTE! This is old and arguably fairly strange behaviour.
128 * We might want to make this an error unconditionally, and
129 * use "--force-remove" if you actually want to force removal).
131 * - it used to exist as a subdirectory (ie multiple files with
132 * this particular prefix) in the index, in which case it's wrong
133 * to try to update it as a directory.
135 * - it doesn't exist at all in the index, but it is a valid
136 * git directory, and it should be *added* as a gitlink.
138 static int process_directory(const char *path, int len, struct stat *st)
140 unsigned char sha1[20];
141 int pos = cache_name_pos(path, len);
143 /* Exact match: file or existing gitlink */
144 if (pos >= 0) {
145 struct cache_entry *ce = active_cache[pos];
146 if (S_ISGITLINK(ce->ce_mode)) {
148 /* Do nothing to the index if there is no HEAD! */
149 if (resolve_gitlink_ref(path, "HEAD", sha1) < 0)
150 return 0;
152 return add_one_path(ce, path, len, st);
154 /* Should this be an unconditional error? */
155 return remove_one_path(path);
158 /* Inexact match: is there perhaps a subdirectory match? */
159 pos = -pos-1;
160 while (pos < active_nr) {
161 struct cache_entry *ce = active_cache[pos++];
163 if (strncmp(ce->name, path, len))
164 break;
165 if (ce->name[len] > '/')
166 break;
167 if (ce->name[len] < '/')
168 continue;
170 /* Subdirectory match - error out */
171 return error("%s: is a directory - add individual files instead", path);
174 /* No match - should we add it as a gitlink? */
175 if (!resolve_gitlink_ref(path, "HEAD", sha1))
176 return add_one_path(NULL, path, len, st);
178 /* Error out. */
179 return error("%s: is a directory - add files inside instead", path);
182 static int process_path(const char *path)
184 int pos, len;
185 struct stat st;
186 struct cache_entry *ce;
188 len = strlen(path);
189 if (has_symlink_leading_path(path, len))
190 return error("'%s' is beyond a symbolic link", path);
192 pos = cache_name_pos(path, len);
193 ce = pos < 0 ? NULL : active_cache[pos];
194 if (ce && ce_skip_worktree(ce)) {
196 * working directory version is assumed "good"
197 * so updating it does not make sense.
198 * On the other hand, removing it from index should work
200 if (allow_remove && remove_file_from_cache(path))
201 return error("%s: cannot remove from the index", path);
202 return 0;
206 * First things first: get the stat information, to decide
207 * what to do about the pathname!
209 if (lstat(path, &st) < 0)
210 return process_lstat_error(path, errno);
212 if (S_ISDIR(st.st_mode))
213 return process_directory(path, len, &st);
215 return add_one_path(ce, path, len, &st);
218 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
219 const char *path, int stage)
221 int size, len, option;
222 struct cache_entry *ce;
224 if (!verify_path(path))
225 return error("Invalid path '%s'", path);
227 len = strlen(path);
228 size = cache_entry_size(len);
229 ce = xcalloc(1, size);
231 hashcpy(ce->sha1, sha1);
232 memcpy(ce->name, path, len);
233 ce->ce_flags = create_ce_flags(stage);
234 ce->ce_namelen = len;
235 ce->ce_mode = create_ce_mode(mode);
236 if (assume_unchanged)
237 ce->ce_flags |= CE_VALID;
238 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
239 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
240 if (add_cache_entry(ce, option))
241 return error("%s: cannot add to the index - missing --add option?",
242 path);
243 report("add '%s'", path);
244 return 0;
247 static void chmod_path(int flip, const char *path)
249 int pos;
250 struct cache_entry *ce;
251 unsigned int mode;
253 pos = cache_name_pos(path, strlen(path));
254 if (pos < 0)
255 goto fail;
256 ce = active_cache[pos];
257 mode = ce->ce_mode;
258 if (!S_ISREG(mode))
259 goto fail;
260 switch (flip) {
261 case '+':
262 ce->ce_mode |= 0111; break;
263 case '-':
264 ce->ce_mode &= ~0111; break;
265 default:
266 goto fail;
268 cache_tree_invalidate_path(active_cache_tree, path);
269 active_cache_changed = 1;
270 report("chmod %cx '%s'", flip, path);
271 return;
272 fail:
273 die("git update-index: cannot chmod %cx '%s'", flip, path);
276 static void update_one(const char *path, const char *prefix, int prefix_length)
278 const char *p = prefix_path(prefix, prefix_length, path);
279 if (!verify_path(p)) {
280 fprintf(stderr, "Ignoring path %s\n", path);
281 goto free_return;
283 if (mark_valid_only) {
284 if (mark_ce_flags(p, CE_VALID, mark_valid_only == MARK_FLAG))
285 die("Unable to mark file %s", path);
286 goto free_return;
288 if (mark_skip_worktree_only) {
289 if (mark_ce_flags(p, CE_SKIP_WORKTREE, mark_skip_worktree_only == MARK_FLAG))
290 die("Unable to mark file %s", path);
291 goto free_return;
294 if (force_remove) {
295 if (remove_file_from_cache(p))
296 die("git update-index: unable to remove %s", path);
297 report("remove '%s'", path);
298 goto free_return;
300 if (process_path(p))
301 die("Unable to process path %s", path);
302 report("add '%s'", path);
303 free_return:
304 if (p < path || p > path + strlen(path))
305 free((char *)p);
308 static void read_index_info(int line_termination)
310 struct strbuf buf = STRBUF_INIT;
311 struct strbuf uq = STRBUF_INIT;
313 while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
314 char *ptr, *tab;
315 char *path_name;
316 unsigned char sha1[20];
317 unsigned int mode;
318 unsigned long ul;
319 int stage;
321 /* This reads lines formatted in one of three formats:
323 * (1) mode SP sha1 TAB path
324 * The first format is what "git apply --index-info"
325 * reports, and used to reconstruct a partial tree
326 * that is used for phony merge base tree when falling
327 * back on 3-way merge.
329 * (2) mode SP type SP sha1 TAB path
330 * The second format is to stuff "git ls-tree" output
331 * into the index file.
333 * (3) mode SP sha1 SP stage TAB path
334 * This format is to put higher order stages into the
335 * index file and matches "git ls-files --stage" output.
337 errno = 0;
338 ul = strtoul(buf.buf, &ptr, 8);
339 if (ptr == buf.buf || *ptr != ' '
340 || errno || (unsigned int) ul != ul)
341 goto bad_line;
342 mode = ul;
344 tab = strchr(ptr, '\t');
345 if (!tab || tab - ptr < 41)
346 goto bad_line;
348 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
349 stage = tab[-1] - '0';
350 ptr = tab + 1; /* point at the head of path */
351 tab = tab - 2; /* point at tail of sha1 */
353 else {
354 stage = 0;
355 ptr = tab + 1; /* point at the head of path */
358 if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
359 goto bad_line;
361 path_name = ptr;
362 if (line_termination && path_name[0] == '"') {
363 strbuf_reset(&uq);
364 if (unquote_c_style(&uq, path_name, NULL)) {
365 die("git update-index: bad quoting of path name");
367 path_name = uq.buf;
370 if (!verify_path(path_name)) {
371 fprintf(stderr, "Ignoring path %s\n", path_name);
372 continue;
375 if (!mode) {
376 /* mode == 0 means there is no such path -- remove */
377 if (remove_file_from_cache(path_name))
378 die("git update-index: unable to remove %s",
379 ptr);
381 else {
382 /* mode ' ' sha1 '\t' name
383 * ptr[-1] points at tab,
384 * ptr[-41] is at the beginning of sha1
386 ptr[-42] = ptr[-1] = 0;
387 if (add_cacheinfo(mode, sha1, path_name, stage))
388 die("git update-index: unable to update %s",
389 path_name);
391 continue;
393 bad_line:
394 die("malformed index info %s", buf.buf);
396 strbuf_release(&buf);
397 strbuf_release(&uq);
400 static const char * const update_index_usage[] = {
401 N_("git update-index [options] [--] [<file>...]"),
402 NULL
405 static unsigned char head_sha1[20];
406 static unsigned char merge_head_sha1[20];
408 static struct cache_entry *read_one_ent(const char *which,
409 unsigned char *ent, const char *path,
410 int namelen, int stage)
412 unsigned mode;
413 unsigned char sha1[20];
414 int size;
415 struct cache_entry *ce;
417 if (get_tree_entry(ent, path, sha1, &mode)) {
418 if (which)
419 error("%s: not in %s branch.", path, which);
420 return NULL;
422 if (mode == S_IFDIR) {
423 if (which)
424 error("%s: not a blob in %s branch.", path, which);
425 return NULL;
427 size = cache_entry_size(namelen);
428 ce = xcalloc(1, size);
430 hashcpy(ce->sha1, sha1);
431 memcpy(ce->name, path, namelen);
432 ce->ce_flags = create_ce_flags(stage);
433 ce->ce_namelen = namelen;
434 ce->ce_mode = create_ce_mode(mode);
435 return ce;
438 static int unresolve_one(const char *path)
440 int namelen = strlen(path);
441 int pos;
442 int ret = 0;
443 struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
445 /* See if there is such entry in the index. */
446 pos = cache_name_pos(path, namelen);
447 if (0 <= pos) {
448 /* already merged */
449 pos = unmerge_cache_entry_at(pos);
450 if (pos < active_nr) {
451 struct cache_entry *ce = active_cache[pos];
452 if (ce_stage(ce) &&
453 ce_namelen(ce) == namelen &&
454 !memcmp(ce->name, path, namelen))
455 return 0;
457 /* no resolve-undo information; fall back */
458 } else {
459 /* If there isn't, either it is unmerged, or
460 * resolved as "removed" by mistake. We do not
461 * want to do anything in the former case.
463 pos = -pos-1;
464 if (pos < active_nr) {
465 struct cache_entry *ce = active_cache[pos];
466 if (ce_namelen(ce) == namelen &&
467 !memcmp(ce->name, path, namelen)) {
468 fprintf(stderr,
469 "%s: skipping still unmerged path.\n",
470 path);
471 goto free_return;
476 /* Grab blobs from given path from HEAD and MERGE_HEAD,
477 * stuff HEAD version in stage #2,
478 * stuff MERGE_HEAD version in stage #3.
480 ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
481 ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
483 if (!ce_2 || !ce_3) {
484 ret = -1;
485 goto free_return;
487 if (!hashcmp(ce_2->sha1, ce_3->sha1) &&
488 ce_2->ce_mode == ce_3->ce_mode) {
489 fprintf(stderr, "%s: identical in both, skipping.\n",
490 path);
491 goto free_return;
494 remove_file_from_cache(path);
495 if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
496 error("%s: cannot add our version to the index.", path);
497 ret = -1;
498 goto free_return;
500 if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
501 return 0;
502 error("%s: cannot add their version to the index.", path);
503 ret = -1;
504 free_return:
505 free(ce_2);
506 free(ce_3);
507 return ret;
510 static void read_head_pointers(void)
512 if (read_ref("HEAD", head_sha1))
513 die("No HEAD -- no initial commit yet?");
514 if (read_ref("MERGE_HEAD", merge_head_sha1)) {
515 fprintf(stderr, "Not in the middle of a merge.\n");
516 exit(0);
520 static int do_unresolve(int ac, const char **av,
521 const char *prefix, int prefix_length)
523 int i;
524 int err = 0;
526 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
527 * are not doing a merge, so exit with success status.
529 read_head_pointers();
531 for (i = 1; i < ac; i++) {
532 const char *arg = av[i];
533 const char *p = prefix_path(prefix, prefix_length, arg);
534 err |= unresolve_one(p);
535 if (p < arg || p > arg + strlen(arg))
536 free((char *)p);
538 return err;
541 static int do_reupdate(int ac, const char **av,
542 const char *prefix, int prefix_length)
544 /* Read HEAD and run update-index on paths that are
545 * merged and already different between index and HEAD.
547 int pos;
548 int has_head = 1;
549 const char **paths = get_pathspec(prefix, av + 1);
550 struct pathspec pathspec;
552 init_pathspec(&pathspec, paths);
554 if (read_ref("HEAD", head_sha1))
555 /* If there is no HEAD, that means it is an initial
556 * commit. Update everything in the index.
558 has_head = 0;
559 redo:
560 for (pos = 0; pos < active_nr; pos++) {
561 struct cache_entry *ce = active_cache[pos];
562 struct cache_entry *old = NULL;
563 int save_nr;
565 if (ce_stage(ce) || !ce_path_match(ce, &pathspec))
566 continue;
567 if (has_head)
568 old = read_one_ent(NULL, head_sha1,
569 ce->name, ce_namelen(ce), 0);
570 if (old && ce->ce_mode == old->ce_mode &&
571 !hashcmp(ce->sha1, old->sha1)) {
572 free(old);
573 continue; /* unchanged */
575 /* Be careful. The working tree may not have the
576 * path anymore, in which case, under 'allow_remove',
577 * or worse yet 'allow_replace', active_nr may decrease.
579 save_nr = active_nr;
580 update_one(ce->name + prefix_length, prefix, prefix_length);
581 if (save_nr != active_nr)
582 goto redo;
584 free_pathspec(&pathspec);
585 return 0;
588 struct refresh_params {
589 unsigned int flags;
590 int *has_errors;
593 static int refresh(struct refresh_params *o, unsigned int flag)
595 setup_work_tree();
596 *o->has_errors |= refresh_cache(o->flags | flag);
597 return 0;
600 static int refresh_callback(const struct option *opt,
601 const char *arg, int unset)
603 return refresh(opt->value, 0);
606 static int really_refresh_callback(const struct option *opt,
607 const char *arg, int unset)
609 return refresh(opt->value, REFRESH_REALLY);
612 static int chmod_callback(const struct option *opt,
613 const char *arg, int unset)
615 char *flip = opt->value;
616 if ((arg[0] != '-' && arg[0] != '+') || arg[1] != 'x' || arg[2])
617 return error("option 'chmod' expects \"+x\" or \"-x\"");
618 *flip = arg[0];
619 return 0;
622 static int resolve_undo_clear_callback(const struct option *opt,
623 const char *arg, int unset)
625 resolve_undo_clear();
626 return 0;
629 static int cacheinfo_callback(struct parse_opt_ctx_t *ctx,
630 const struct option *opt, int unset)
632 unsigned char sha1[20];
633 unsigned int mode;
635 if (ctx->argc <= 3)
636 return error("option 'cacheinfo' expects three arguments");
637 if (strtoul_ui(*++ctx->argv, 8, &mode) ||
638 get_sha1_hex(*++ctx->argv, sha1) ||
639 add_cacheinfo(mode, sha1, *++ctx->argv, 0))
640 die("git update-index: --cacheinfo cannot add %s", *ctx->argv);
641 ctx->argc -= 3;
642 return 0;
645 static int stdin_cacheinfo_callback(struct parse_opt_ctx_t *ctx,
646 const struct option *opt, int unset)
648 int *line_termination = opt->value;
650 if (ctx->argc != 1)
651 return error("option '%s' must be the last argument", opt->long_name);
652 allow_add = allow_replace = allow_remove = 1;
653 read_index_info(*line_termination);
654 return 0;
657 static int stdin_callback(struct parse_opt_ctx_t *ctx,
658 const struct option *opt, int unset)
660 int *read_from_stdin = opt->value;
662 if (ctx->argc != 1)
663 return error("option '%s' must be the last argument", opt->long_name);
664 *read_from_stdin = 1;
665 return 0;
668 static int unresolve_callback(struct parse_opt_ctx_t *ctx,
669 const struct option *opt, int flags)
671 int *has_errors = opt->value;
672 const char *prefix = startup_info->prefix;
674 /* consume remaining arguments. */
675 *has_errors = do_unresolve(ctx->argc, ctx->argv,
676 prefix, prefix ? strlen(prefix) : 0);
677 if (*has_errors)
678 active_cache_changed = 0;
680 ctx->argv += ctx->argc - 1;
681 ctx->argc = 1;
682 return 0;
685 static int reupdate_callback(struct parse_opt_ctx_t *ctx,
686 const struct option *opt, int flags)
688 int *has_errors = opt->value;
689 const char *prefix = startup_info->prefix;
691 /* consume remaining arguments. */
692 setup_work_tree();
693 *has_errors = do_reupdate(ctx->argc, ctx->argv,
694 prefix, prefix ? strlen(prefix) : 0);
695 if (*has_errors)
696 active_cache_changed = 0;
698 ctx->argv += ctx->argc - 1;
699 ctx->argc = 1;
700 return 0;
703 int cmd_update_index(int argc, const char **argv, const char *prefix)
705 int newfd, entries, has_errors = 0, line_termination = '\n';
706 int read_from_stdin = 0;
707 int prefix_length = prefix ? strlen(prefix) : 0;
708 int preferred_index_format = 0;
709 char set_executable_bit = 0;
710 struct refresh_params refresh_args = {0, &has_errors};
711 int lock_error = 0;
712 struct lock_file *lock_file;
713 struct parse_opt_ctx_t ctx;
714 int parseopt_state = PARSE_OPT_UNKNOWN;
715 struct option options[] = {
716 OPT_BIT('q', NULL, &refresh_args.flags,
717 N_("continue refresh even when index needs update"),
718 REFRESH_QUIET),
719 OPT_BIT(0, "ignore-submodules", &refresh_args.flags,
720 N_("refresh: ignore submodules"),
721 REFRESH_IGNORE_SUBMODULES),
722 OPT_SET_INT(0, "add", &allow_add,
723 N_("do not ignore new files"), 1),
724 OPT_SET_INT(0, "replace", &allow_replace,
725 N_("let files replace directories and vice-versa"), 1),
726 OPT_SET_INT(0, "remove", &allow_remove,
727 N_("notice files missing from worktree"), 1),
728 OPT_BIT(0, "unmerged", &refresh_args.flags,
729 N_("refresh even if index contains unmerged entries"),
730 REFRESH_UNMERGED),
731 {OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL,
732 N_("refresh stat information"),
733 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
734 refresh_callback},
735 {OPTION_CALLBACK, 0, "really-refresh", &refresh_args, NULL,
736 N_("like --refresh, but ignore assume-unchanged setting"),
737 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
738 really_refresh_callback},
739 {OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
740 N_("<mode> <object> <path>"),
741 N_("add the specified entry to the index"),
742 PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
743 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
744 (parse_opt_cb *) cacheinfo_callback},
745 {OPTION_CALLBACK, 0, "chmod", &set_executable_bit, N_("(+/-)x"),
746 N_("override the executable bit of the listed files"),
747 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
748 chmod_callback},
749 {OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
750 N_("mark files as \"not changing\""),
751 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
752 {OPTION_SET_INT, 0, "no-assume-unchanged", &mark_valid_only, NULL,
753 N_("clear assumed-unchanged bit"),
754 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
755 {OPTION_SET_INT, 0, "skip-worktree", &mark_skip_worktree_only, NULL,
756 N_("mark files as \"index-only\""),
757 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
758 {OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
759 N_("clear skip-worktree bit"),
760 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
761 OPT_SET_INT(0, "info-only", &info_only,
762 N_("add to index only; do not add content to object database"), 1),
763 OPT_SET_INT(0, "force-remove", &force_remove,
764 N_("remove named paths even if present in worktree"), 1),
765 OPT_SET_INT('z', NULL, &line_termination,
766 N_("with --stdin: input lines are terminated by null bytes"), '\0'),
767 {OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
768 N_("read list of paths to be updated from standard input"),
769 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
770 (parse_opt_cb *) stdin_callback},
771 {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &line_termination, NULL,
772 N_("add entries from standard input to the index"),
773 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
774 (parse_opt_cb *) stdin_cacheinfo_callback},
775 {OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
776 N_("repopulate stages #2 and #3 for the listed paths"),
777 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
778 (parse_opt_cb *) unresolve_callback},
779 {OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
780 N_("only update entries that differ from HEAD"),
781 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
782 (parse_opt_cb *) reupdate_callback},
783 OPT_BIT(0, "ignore-missing", &refresh_args.flags,
784 N_("ignore files missing from worktree"),
785 REFRESH_IGNORE_MISSING),
786 OPT_SET_INT(0, "verbose", &verbose,
787 N_("report actions to standard output"), 1),
788 {OPTION_CALLBACK, 0, "clear-resolve-undo", NULL, NULL,
789 N_("(for porcelains) forget saved unresolved conflicts"),
790 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
791 resolve_undo_clear_callback},
792 OPT_INTEGER(0, "index-version", &preferred_index_format,
793 N_("write index in this format")),
794 OPT_END()
797 if (argc == 2 && !strcmp(argv[1], "-h"))
798 usage(update_index_usage[0]);
800 git_config(git_default_config, NULL);
802 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
803 lock_file = xcalloc(1, sizeof(struct lock_file));
805 newfd = hold_locked_index(lock_file, 0);
806 if (newfd < 0)
807 lock_error = errno;
809 entries = read_cache();
810 if (entries < 0)
811 die("cache corrupted");
814 * Custom copy of parse_options() because we want to handle
815 * filename arguments as they come.
817 parse_options_start(&ctx, argc, argv, prefix,
818 options, PARSE_OPT_STOP_AT_NON_OPTION);
819 while (ctx.argc) {
820 if (parseopt_state != PARSE_OPT_DONE)
821 parseopt_state = parse_options_step(&ctx, options,
822 update_index_usage);
823 if (!ctx.argc)
824 break;
825 switch (parseopt_state) {
826 case PARSE_OPT_HELP:
827 exit(129);
828 case PARSE_OPT_NON_OPTION:
829 case PARSE_OPT_DONE:
831 const char *path = ctx.argv[0];
832 const char *p;
834 setup_work_tree();
835 p = prefix_path(prefix, prefix_length, path);
836 update_one(p, NULL, 0);
837 if (set_executable_bit)
838 chmod_path(set_executable_bit, p);
839 if (p < path || p > path + strlen(path))
840 free((char *)p);
841 ctx.argc--;
842 ctx.argv++;
843 break;
845 case PARSE_OPT_UNKNOWN:
846 if (ctx.argv[0][1] == '-')
847 error("unknown option '%s'", ctx.argv[0] + 2);
848 else
849 error("unknown switch '%c'", *ctx.opt);
850 usage_with_options(update_index_usage, options);
853 argc = parse_options_end(&ctx);
854 if (preferred_index_format) {
855 if (preferred_index_format < INDEX_FORMAT_LB ||
856 INDEX_FORMAT_UB < preferred_index_format)
857 die("index-version %d not in range: %d..%d",
858 preferred_index_format,
859 INDEX_FORMAT_LB, INDEX_FORMAT_UB);
861 if (the_index.version != preferred_index_format)
862 active_cache_changed = 1;
863 the_index.version = preferred_index_format;
866 if (read_from_stdin) {
867 struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
869 setup_work_tree();
870 while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
871 const char *p;
872 if (line_termination && buf.buf[0] == '"') {
873 strbuf_reset(&nbuf);
874 if (unquote_c_style(&nbuf, buf.buf, NULL))
875 die("line is badly quoted");
876 strbuf_swap(&buf, &nbuf);
878 p = prefix_path(prefix, prefix_length, buf.buf);
879 update_one(p, NULL, 0);
880 if (set_executable_bit)
881 chmod_path(set_executable_bit, p);
882 if (p < buf.buf || p > buf.buf + buf.len)
883 free((char *)p);
885 strbuf_release(&nbuf);
886 strbuf_release(&buf);
889 if (active_cache_changed) {
890 if (newfd < 0) {
891 if (refresh_args.flags & REFRESH_QUIET)
892 exit(128);
893 unable_to_lock_index_die(get_index_file(), lock_error);
895 if (write_cache(newfd, active_cache, active_nr) ||
896 commit_locked_index(lock_file))
897 die("Unable to write new index file");
900 rollback_lock_file(lock_file);
902 return has_errors ? 1 : 0;