git-fast-import.txt: --relative-marks takes no parameter
[git/dscho.git] / builtin / update-index.c
blobd7850c6309aec0c1a4f640999fb757d7b32ba1b8
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 = len;
99 fill_stat_cache_info(ce, st);
100 ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
102 if (index_path(ce->sha1, path, st, !info_only))
103 return -1;
104 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
105 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
106 if (add_cache_entry(ce, option))
107 return error("%s: cannot add to the index - missing --add option?", path);
108 return 0;
112 * Handle a path that was a directory. Four cases:
114 * - it's already a gitlink in the index, and we keep it that
115 * way, and update it if we can (if we cannot find the HEAD,
116 * we're going to keep it unchanged in the index!)
118 * - it's a *file* in the index, in which case it should be
119 * removed as a file if removal is allowed, since it doesn't
120 * exist as such any more. If removal isn't allowed, it's
121 * an error.
123 * (NOTE! This is old and arguably fairly strange behaviour.
124 * We might want to make this an error unconditionally, and
125 * use "--force-remove" if you actually want to force removal).
127 * - it used to exist as a subdirectory (ie multiple files with
128 * this particular prefix) in the index, in which case it's wrong
129 * to try to update it as a directory.
131 * - it doesn't exist at all in the index, but it is a valid
132 * git directory, and it should be *added* as a gitlink.
134 static int process_directory(const char *path, int len, struct stat *st)
136 unsigned char sha1[20];
137 int pos = cache_name_pos(path, len);
139 /* Exact match: file or existing gitlink */
140 if (pos >= 0) {
141 struct cache_entry *ce = active_cache[pos];
142 if (S_ISGITLINK(ce->ce_mode)) {
144 /* Do nothing to the index if there is no HEAD! */
145 if (resolve_gitlink_ref(path, "HEAD", sha1) < 0)
146 return 0;
148 return add_one_path(ce, path, len, st);
150 /* Should this be an unconditional error? */
151 return remove_one_path(path);
154 /* Inexact match: is there perhaps a subdirectory match? */
155 pos = -pos-1;
156 while (pos < active_nr) {
157 struct cache_entry *ce = active_cache[pos++];
159 if (strncmp(ce->name, path, len))
160 break;
161 if (ce->name[len] > '/')
162 break;
163 if (ce->name[len] < '/')
164 continue;
166 /* Subdirectory match - error out */
167 return error("%s: is a directory - add individual files instead", path);
170 /* No match - should we add it as a gitlink? */
171 if (!resolve_gitlink_ref(path, "HEAD", sha1))
172 return add_one_path(NULL, path, len, st);
174 /* Error out. */
175 return error("%s: is a directory - add files inside instead", path);
178 static int process_path(const char *path)
180 int pos, len;
181 struct stat st;
182 struct cache_entry *ce;
184 len = strlen(path);
185 if (has_symlink_leading_path(path, len))
186 return error("'%s' is beyond a symbolic link", path);
188 pos = cache_name_pos(path, len);
189 ce = pos < 0 ? NULL : active_cache[pos];
190 if (ce && ce_skip_worktree(ce)) {
192 * working directory version is assumed "good"
193 * so updating it does not make sense.
194 * On the other hand, removing it from index should work
196 if (allow_remove && remove_file_from_cache(path))
197 return error("%s: cannot remove from the index", path);
198 return 0;
202 * First things first: get the stat information, to decide
203 * what to do about the pathname!
205 if (lstat(path, &st) < 0)
206 return process_lstat_error(path, errno);
208 if (S_ISDIR(st.st_mode))
209 return process_directory(path, len, &st);
212 * Process a regular file
214 if (ce && S_ISGITLINK(ce->ce_mode))
215 return error("%s is already a gitlink, not replacing", path);
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(len, stage);
236 ce->ce_mode = create_ce_mode(mode);
237 if (assume_unchanged)
238 ce->ce_flags |= CE_VALID;
239 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
240 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
241 if (add_cache_entry(ce, option))
242 return error("%s: cannot add to the index - missing --add option?",
243 path);
244 report("add '%s'", path);
245 return 0;
248 static void chmod_path(int flip, const char *path)
250 int pos;
251 struct cache_entry *ce;
252 unsigned int mode;
254 pos = cache_name_pos(path, strlen(path));
255 if (pos < 0)
256 goto fail;
257 ce = active_cache[pos];
258 mode = ce->ce_mode;
259 if (!S_ISREG(mode))
260 goto fail;
261 switch (flip) {
262 case '+':
263 ce->ce_mode |= 0111; break;
264 case '-':
265 ce->ce_mode &= ~0111; break;
266 default:
267 goto fail;
269 cache_tree_invalidate_path(active_cache_tree, path);
270 active_cache_changed = 1;
271 report("chmod %cx '%s'", flip, path);
272 return;
273 fail:
274 die("git update-index: cannot chmod %cx '%s'", flip, path);
277 static void update_one(const char *path, const char *prefix, int prefix_length)
279 const char *p = prefix_path(prefix, prefix_length, path);
280 if (!verify_path(p)) {
281 fprintf(stderr, "Ignoring path %s\n", path);
282 goto free_return;
284 if (mark_valid_only) {
285 if (mark_ce_flags(p, CE_VALID, mark_valid_only == MARK_FLAG))
286 die("Unable to mark file %s", path);
287 goto free_return;
289 if (mark_skip_worktree_only) {
290 if (mark_ce_flags(p, CE_SKIP_WORKTREE, mark_skip_worktree_only == MARK_FLAG))
291 die("Unable to mark file %s", path);
292 goto free_return;
295 if (force_remove) {
296 if (remove_file_from_cache(p))
297 die("git update-index: unable to remove %s", path);
298 report("remove '%s'", path);
299 goto free_return;
301 if (process_path(p))
302 die("Unable to process path %s", path);
303 report("add '%s'", path);
304 free_return:
305 if (p < path || p > path + strlen(path))
306 free((char *)p);
309 static void read_index_info(int line_termination)
311 struct strbuf buf = STRBUF_INIT;
312 struct strbuf uq = STRBUF_INIT;
314 while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
315 char *ptr, *tab;
316 char *path_name;
317 unsigned char sha1[20];
318 unsigned int mode;
319 unsigned long ul;
320 int stage;
322 /* This reads lines formatted in one of three formats:
324 * (1) mode SP sha1 TAB path
325 * The first format is what "git apply --index-info"
326 * reports, and used to reconstruct a partial tree
327 * that is used for phony merge base tree when falling
328 * back on 3-way merge.
330 * (2) mode SP type SP sha1 TAB path
331 * The second format is to stuff "git ls-tree" output
332 * into the index file.
334 * (3) mode SP sha1 SP stage TAB path
335 * This format is to put higher order stages into the
336 * index file and matches "git ls-files --stage" output.
338 errno = 0;
339 ul = strtoul(buf.buf, &ptr, 8);
340 if (ptr == buf.buf || *ptr != ' '
341 || errno || (unsigned int) ul != ul)
342 goto bad_line;
343 mode = ul;
345 tab = strchr(ptr, '\t');
346 if (!tab || tab - ptr < 41)
347 goto bad_line;
349 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
350 stage = tab[-1] - '0';
351 ptr = tab + 1; /* point at the head of path */
352 tab = tab - 2; /* point at tail of sha1 */
354 else {
355 stage = 0;
356 ptr = tab + 1; /* point at the head of path */
359 if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
360 goto bad_line;
362 path_name = ptr;
363 if (line_termination && path_name[0] == '"') {
364 strbuf_reset(&uq);
365 if (unquote_c_style(&uq, path_name, NULL)) {
366 die("git update-index: bad quoting of path name");
368 path_name = uq.buf;
371 if (!verify_path(path_name)) {
372 fprintf(stderr, "Ignoring path %s\n", path_name);
373 continue;
376 if (!mode) {
377 /* mode == 0 means there is no such path -- remove */
378 if (remove_file_from_cache(path_name))
379 die("git update-index: unable to remove %s",
380 ptr);
382 else {
383 /* mode ' ' sha1 '\t' name
384 * ptr[-1] points at tab,
385 * ptr[-41] is at the beginning of sha1
387 ptr[-42] = ptr[-1] = 0;
388 if (add_cacheinfo(mode, sha1, path_name, stage))
389 die("git update-index: unable to update %s",
390 path_name);
392 continue;
394 bad_line:
395 die("malformed index info %s", buf.buf);
397 strbuf_release(&buf);
398 strbuf_release(&uq);
401 static const char * const update_index_usage[] = {
402 "git update-index [options] [--] [<file>...]",
403 NULL
406 static unsigned char head_sha1[20];
407 static unsigned char merge_head_sha1[20];
409 static struct cache_entry *read_one_ent(const char *which,
410 unsigned char *ent, const char *path,
411 int namelen, int stage)
413 unsigned mode;
414 unsigned char sha1[20];
415 int size;
416 struct cache_entry *ce;
418 if (get_tree_entry(ent, path, sha1, &mode)) {
419 if (which)
420 error("%s: not in %s branch.", path, which);
421 return NULL;
423 if (mode == S_IFDIR) {
424 if (which)
425 error("%s: not a blob in %s branch.", path, which);
426 return NULL;
428 size = cache_entry_size(namelen);
429 ce = xcalloc(1, size);
431 hashcpy(ce->sha1, sha1);
432 memcpy(ce->name, path, namelen);
433 ce->ce_flags = create_ce_flags(namelen, stage);
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 char set_executable_bit = 0;
709 struct refresh_params refresh_args = {0, &has_errors};
710 int lock_error = 0;
711 struct lock_file *lock_file;
712 struct parse_opt_ctx_t ctx;
713 int parseopt_state = PARSE_OPT_UNKNOWN;
714 struct option options[] = {
715 OPT_BIT('q', NULL, &refresh_args.flags,
716 "continue refresh even when index needs update",
717 REFRESH_QUIET),
718 OPT_BIT(0, "ignore-submodules", &refresh_args.flags,
719 "refresh: ignore submodules",
720 REFRESH_IGNORE_SUBMODULES),
721 OPT_SET_INT(0, "add", &allow_add,
722 "do not ignore new files", 1),
723 OPT_SET_INT(0, "replace", &allow_replace,
724 "let files replace directories and vice-versa", 1),
725 OPT_SET_INT(0, "remove", &allow_remove,
726 "notice files missing from worktree", 1),
727 OPT_BIT(0, "unmerged", &refresh_args.flags,
728 "refresh even if index contains unmerged entries",
729 REFRESH_UNMERGED),
730 {OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL,
731 "refresh stat information",
732 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
733 refresh_callback},
734 {OPTION_CALLBACK, 0, "really-refresh", &refresh_args, NULL,
735 "like --refresh, but ignore assume-unchanged setting",
736 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
737 really_refresh_callback},
738 {OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
739 "<mode> <object> <path>",
740 "add the specified entry to the index",
741 PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
742 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
743 (parse_opt_cb *) cacheinfo_callback},
744 {OPTION_CALLBACK, 0, "chmod", &set_executable_bit, "(+/-)x",
745 "override the executable bit of the listed files",
746 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
747 chmod_callback},
748 {OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
749 "mark files as \"not changing\"",
750 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
751 {OPTION_SET_INT, 0, "no-assume-unchanged", &mark_valid_only, NULL,
752 "clear assumed-unchanged bit",
753 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
754 {OPTION_SET_INT, 0, "skip-worktree", &mark_skip_worktree_only, NULL,
755 "mark files as \"index-only\"",
756 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
757 {OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
758 "clear skip-worktree bit",
759 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
760 OPT_SET_INT(0, "info-only", &info_only,
761 "add to index only; do not add content to object database", 1),
762 OPT_SET_INT(0, "force-remove", &force_remove,
763 "remove named paths even if present in worktree", 1),
764 OPT_SET_INT('z', NULL, &line_termination,
765 "with --stdin: input lines are terminated by null bytes", '\0'),
766 {OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
767 "read list of paths to be updated from standard input",
768 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
769 (parse_opt_cb *) stdin_callback},
770 {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &line_termination, NULL,
771 "add entries from standard input to the index",
772 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
773 (parse_opt_cb *) stdin_cacheinfo_callback},
774 {OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
775 "repopulate stages #2 and #3 for the listed paths",
776 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
777 (parse_opt_cb *) unresolve_callback},
778 {OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
779 "only update entries that differ from HEAD",
780 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
781 (parse_opt_cb *) reupdate_callback},
782 OPT_BIT(0, "ignore-missing", &refresh_args.flags,
783 "ignore files missing from worktree",
784 REFRESH_IGNORE_MISSING),
785 OPT_SET_INT(0, "verbose", &verbose,
786 "report actions to standard output", 1),
787 {OPTION_CALLBACK, 0, "clear-resolve-undo", NULL, NULL,
788 "(for porcelains) forget saved unresolved conflicts",
789 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
790 resolve_undo_clear_callback},
791 OPT_END()
794 if (argc == 2 && !strcmp(argv[1], "-h"))
795 usage(update_index_usage[0]);
797 git_config(git_default_config, NULL);
799 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
800 lock_file = xcalloc(1, sizeof(struct lock_file));
802 newfd = hold_locked_index(lock_file, 0);
803 if (newfd < 0)
804 lock_error = errno;
806 entries = read_cache();
807 if (entries < 0)
808 die("cache corrupted");
811 * Custom copy of parse_options() because we want to handle
812 * filename arguments as they come.
814 parse_options_start(&ctx, argc, argv, prefix,
815 options, PARSE_OPT_STOP_AT_NON_OPTION);
816 while (ctx.argc) {
817 if (parseopt_state != PARSE_OPT_DONE)
818 parseopt_state = parse_options_step(&ctx, options,
819 update_index_usage);
820 if (!ctx.argc)
821 break;
822 switch (parseopt_state) {
823 case PARSE_OPT_HELP:
824 exit(129);
825 case PARSE_OPT_NON_OPTION:
826 case PARSE_OPT_DONE:
828 const char *path = ctx.argv[0];
829 const char *p;
831 setup_work_tree();
832 p = prefix_path(prefix, prefix_length, path);
833 update_one(p, NULL, 0);
834 if (set_executable_bit)
835 chmod_path(set_executable_bit, p);
836 if (p < path || p > path + strlen(path))
837 free((char *)p);
838 ctx.argc--;
839 ctx.argv++;
840 break;
842 case PARSE_OPT_UNKNOWN:
843 if (ctx.argv[0][1] == '-')
844 error("unknown option '%s'", ctx.argv[0] + 2);
845 else
846 error("unknown switch '%c'", *ctx.opt);
847 usage_with_options(update_index_usage, options);
850 argc = parse_options_end(&ctx);
852 if (read_from_stdin) {
853 struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
855 setup_work_tree();
856 while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
857 const char *p;
858 if (line_termination && buf.buf[0] == '"') {
859 strbuf_reset(&nbuf);
860 if (unquote_c_style(&nbuf, buf.buf, NULL))
861 die("line is badly quoted");
862 strbuf_swap(&buf, &nbuf);
864 p = prefix_path(prefix, prefix_length, buf.buf);
865 update_one(p, NULL, 0);
866 if (set_executable_bit)
867 chmod_path(set_executable_bit, p);
868 if (p < buf.buf || p > buf.buf + buf.len)
869 free((char *)p);
871 strbuf_release(&nbuf);
872 strbuf_release(&buf);
875 if (active_cache_changed) {
876 if (newfd < 0) {
877 if (refresh_args.flags & REFRESH_QUIET)
878 exit(128);
879 unable_to_lock_index_die(get_index_file(), lock_error);
881 if (write_cache(newfd, active_cache, active_nr) ||
882 commit_locked_index(lock_file))
883 die("Unable to write new index file");
886 rollback_lock_file(lock_file);
888 return has_errors ? 1 : 0;