bash: teach 'git reset --patch'
[git/spearce.git] / builtin-update-index.c
blob92beaaf4b3ca5520a9af27bde7f15dda46d80197
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"
14 * Default to not allowing changes to the list of files. The
15 * tool doesn't actually care, but this makes it harder to add
16 * files to the revision control by mistake by doing something
17 * like "git update-index *" and suddenly having all the object
18 * files be revision controlled.
20 static int allow_add;
21 static int allow_remove;
22 static int allow_replace;
23 static int info_only;
24 static int force_remove;
25 static int verbose;
26 static int mark_valid_only;
27 #define MARK_VALID 1
28 #define UNMARK_VALID 2
30 static void report(const char *fmt, ...)
32 va_list vp;
34 if (!verbose)
35 return;
37 va_start(vp, fmt);
38 vprintf(fmt, vp);
39 putchar('\n');
40 va_end(vp);
43 static int mark_valid(const char *path)
45 int namelen = strlen(path);
46 int pos = cache_name_pos(path, namelen);
47 if (0 <= pos) {
48 switch (mark_valid_only) {
49 case MARK_VALID:
50 active_cache[pos]->ce_flags |= CE_VALID;
51 break;
52 case UNMARK_VALID:
53 active_cache[pos]->ce_flags &= ~CE_VALID;
54 break;
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);
179 * Process a regular file
181 static int process_file(const char *path, int len, struct stat *st)
183 int pos = cache_name_pos(path, len);
184 struct cache_entry *ce = pos < 0 ? NULL : active_cache[pos];
186 if (ce && S_ISGITLINK(ce->ce_mode))
187 return error("%s is already a gitlink, not replacing", path);
189 return add_one_path(ce, path, len, st);
192 static int process_path(const char *path)
194 int len;
195 struct stat st;
197 len = strlen(path);
198 if (has_symlink_leading_path(path, len))
199 return error("'%s' is beyond a symbolic link", path);
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);
211 return process_file(path, len, &st);
214 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
215 const char *path, int stage)
217 int size, len, option;
218 struct cache_entry *ce;
220 if (!verify_path(path))
221 return error("Invalid path '%s'", path);
223 len = strlen(path);
224 size = cache_entry_size(len);
225 ce = xcalloc(1, size);
227 hashcpy(ce->sha1, sha1);
228 memcpy(ce->name, path, len);
229 ce->ce_flags = create_ce_flags(len, stage);
230 ce->ce_mode = create_ce_mode(mode);
231 if (assume_unchanged)
232 ce->ce_flags |= CE_VALID;
233 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
234 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
235 if (add_cache_entry(ce, option))
236 return error("%s: cannot add to the index - missing --add option?",
237 path);
238 report("add '%s'", path);
239 return 0;
242 static void chmod_path(int flip, const char *path)
244 int pos;
245 struct cache_entry *ce;
246 unsigned int mode;
248 pos = cache_name_pos(path, strlen(path));
249 if (pos < 0)
250 goto fail;
251 ce = active_cache[pos];
252 mode = ce->ce_mode;
253 if (!S_ISREG(mode))
254 goto fail;
255 switch (flip) {
256 case '+':
257 ce->ce_mode |= 0111; break;
258 case '-':
259 ce->ce_mode &= ~0111; break;
260 default:
261 goto fail;
263 cache_tree_invalidate_path(active_cache_tree, path);
264 active_cache_changed = 1;
265 report("chmod %cx '%s'", flip, path);
266 return;
267 fail:
268 die("git update-index: cannot chmod %cx '%s'", flip, path);
271 static void update_one(const char *path, const char *prefix, int prefix_length)
273 const char *p = prefix_path(prefix, prefix_length, path);
274 if (!verify_path(p)) {
275 fprintf(stderr, "Ignoring path %s\n", path);
276 goto free_return;
278 if (mark_valid_only) {
279 if (mark_valid(p))
280 die("Unable to mark file %s", path);
281 goto free_return;
284 if (force_remove) {
285 if (remove_file_from_cache(p))
286 die("git update-index: unable to remove %s", path);
287 report("remove '%s'", path);
288 goto free_return;
290 if (process_path(p))
291 die("Unable to process path %s", path);
292 report("add '%s'", path);
293 free_return:
294 if (p < path || p > path + strlen(path))
295 free((char *)p);
298 static void read_index_info(int line_termination)
300 struct strbuf buf = STRBUF_INIT;
301 struct strbuf uq = STRBUF_INIT;
303 while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
304 char *ptr, *tab;
305 char *path_name;
306 unsigned char sha1[20];
307 unsigned int mode;
308 unsigned long ul;
309 int stage;
311 /* This reads lines formatted in one of three formats:
313 * (1) mode SP sha1 TAB path
314 * The first format is what "git apply --index-info"
315 * reports, and used to reconstruct a partial tree
316 * that is used for phony merge base tree when falling
317 * back on 3-way merge.
319 * (2) mode SP type SP sha1 TAB path
320 * The second format is to stuff "git ls-tree" output
321 * into the index file.
323 * (3) mode SP sha1 SP stage TAB path
324 * This format is to put higher order stages into the
325 * index file and matches "git ls-files --stage" output.
327 errno = 0;
328 ul = strtoul(buf.buf, &ptr, 8);
329 if (ptr == buf.buf || *ptr != ' '
330 || errno || (unsigned int) ul != ul)
331 goto bad_line;
332 mode = ul;
334 tab = strchr(ptr, '\t');
335 if (!tab || tab - ptr < 41)
336 goto bad_line;
338 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
339 stage = tab[-1] - '0';
340 ptr = tab + 1; /* point at the head of path */
341 tab = tab - 2; /* point at tail of sha1 */
343 else {
344 stage = 0;
345 ptr = tab + 1; /* point at the head of path */
348 if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
349 goto bad_line;
351 path_name = ptr;
352 if (line_termination && path_name[0] == '"') {
353 strbuf_reset(&uq);
354 if (unquote_c_style(&uq, path_name, NULL)) {
355 die("git update-index: bad quoting of path name");
357 path_name = uq.buf;
360 if (!verify_path(path_name)) {
361 fprintf(stderr, "Ignoring path %s\n", path_name);
362 continue;
365 if (!mode) {
366 /* mode == 0 means there is no such path -- remove */
367 if (remove_file_from_cache(path_name))
368 die("git update-index: unable to remove %s",
369 ptr);
371 else {
372 /* mode ' ' sha1 '\t' name
373 * ptr[-1] points at tab,
374 * ptr[-41] is at the beginning of sha1
376 ptr[-42] = ptr[-1] = 0;
377 if (add_cacheinfo(mode, sha1, path_name, stage))
378 die("git update-index: unable to update %s",
379 path_name);
381 continue;
383 bad_line:
384 die("malformed index info %s", buf.buf);
386 strbuf_release(&buf);
387 strbuf_release(&uq);
390 static const char update_index_usage[] =
391 "git update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] <file>...";
393 static unsigned char head_sha1[20];
394 static unsigned char merge_head_sha1[20];
396 static struct cache_entry *read_one_ent(const char *which,
397 unsigned char *ent, const char *path,
398 int namelen, int stage)
400 unsigned mode;
401 unsigned char sha1[20];
402 int size;
403 struct cache_entry *ce;
405 if (get_tree_entry(ent, path, sha1, &mode)) {
406 if (which)
407 error("%s: not in %s branch.", path, which);
408 return NULL;
410 if (mode == S_IFDIR) {
411 if (which)
412 error("%s: not a blob in %s branch.", path, which);
413 return NULL;
415 size = cache_entry_size(namelen);
416 ce = xcalloc(1, size);
418 hashcpy(ce->sha1, sha1);
419 memcpy(ce->name, path, namelen);
420 ce->ce_flags = create_ce_flags(namelen, stage);
421 ce->ce_mode = create_ce_mode(mode);
422 return ce;
425 static int unresolve_one(const char *path)
427 int namelen = strlen(path);
428 int pos;
429 int ret = 0;
430 struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
432 /* See if there is such entry in the index. */
433 pos = cache_name_pos(path, namelen);
434 if (pos < 0) {
435 /* If there isn't, either it is unmerged, or
436 * resolved as "removed" by mistake. We do not
437 * want to do anything in the former case.
439 pos = -pos-1;
440 if (pos < active_nr) {
441 struct cache_entry *ce = active_cache[pos];
442 if (ce_namelen(ce) == namelen &&
443 !memcmp(ce->name, path, namelen)) {
444 fprintf(stderr,
445 "%s: skipping still unmerged path.\n",
446 path);
447 goto free_return;
452 /* Grab blobs from given path from HEAD and MERGE_HEAD,
453 * stuff HEAD version in stage #2,
454 * stuff MERGE_HEAD version in stage #3.
456 ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
457 ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
459 if (!ce_2 || !ce_3) {
460 ret = -1;
461 goto free_return;
463 if (!hashcmp(ce_2->sha1, ce_3->sha1) &&
464 ce_2->ce_mode == ce_3->ce_mode) {
465 fprintf(stderr, "%s: identical in both, skipping.\n",
466 path);
467 goto free_return;
470 remove_file_from_cache(path);
471 if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
472 error("%s: cannot add our version to the index.", path);
473 ret = -1;
474 goto free_return;
476 if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
477 return 0;
478 error("%s: cannot add their version to the index.", path);
479 ret = -1;
480 free_return:
481 free(ce_2);
482 free(ce_3);
483 return ret;
486 static void read_head_pointers(void)
488 if (read_ref("HEAD", head_sha1))
489 die("No HEAD -- no initial commit yet?");
490 if (read_ref("MERGE_HEAD", merge_head_sha1)) {
491 fprintf(stderr, "Not in the middle of a merge.\n");
492 exit(0);
496 static int do_unresolve(int ac, const char **av,
497 const char *prefix, int prefix_length)
499 int i;
500 int err = 0;
502 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
503 * are not doing a merge, so exit with success status.
505 read_head_pointers();
507 for (i = 1; i < ac; i++) {
508 const char *arg = av[i];
509 const char *p = prefix_path(prefix, prefix_length, arg);
510 err |= unresolve_one(p);
511 if (p < arg || p > arg + strlen(arg))
512 free((char *)p);
514 return err;
517 static int do_reupdate(int ac, const char **av,
518 const char *prefix, int prefix_length)
520 /* Read HEAD and run update-index on paths that are
521 * merged and already different between index and HEAD.
523 int pos;
524 int has_head = 1;
525 const char **pathspec = get_pathspec(prefix, av + 1);
527 if (read_ref("HEAD", head_sha1))
528 /* If there is no HEAD, that means it is an initial
529 * commit. Update everything in the index.
531 has_head = 0;
532 redo:
533 for (pos = 0; pos < active_nr; pos++) {
534 struct cache_entry *ce = active_cache[pos];
535 struct cache_entry *old = NULL;
536 int save_nr;
538 if (ce_stage(ce) || !ce_path_match(ce, pathspec))
539 continue;
540 if (has_head)
541 old = read_one_ent(NULL, head_sha1,
542 ce->name, ce_namelen(ce), 0);
543 if (old && ce->ce_mode == old->ce_mode &&
544 !hashcmp(ce->sha1, old->sha1)) {
545 free(old);
546 continue; /* unchanged */
548 /* Be careful. The working tree may not have the
549 * path anymore, in which case, under 'allow_remove',
550 * or worse yet 'allow_replace', active_nr may decrease.
552 save_nr = active_nr;
553 update_one(ce->name + prefix_length, prefix, prefix_length);
554 if (save_nr != active_nr)
555 goto redo;
557 return 0;
560 int cmd_update_index(int argc, const char **argv, const char *prefix)
562 int i, newfd, entries, has_errors = 0, line_termination = '\n';
563 int allow_options = 1;
564 int read_from_stdin = 0;
565 int prefix_length = prefix ? strlen(prefix) : 0;
566 char set_executable_bit = 0;
567 unsigned int refresh_flags = 0;
568 int lock_error = 0;
569 struct lock_file *lock_file;
571 git_config(git_default_config, NULL);
573 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
574 lock_file = xcalloc(1, sizeof(struct lock_file));
576 newfd = hold_locked_index(lock_file, 0);
577 if (newfd < 0)
578 lock_error = errno;
580 entries = read_cache();
581 if (entries < 0)
582 die("cache corrupted");
584 for (i = 1 ; i < argc; i++) {
585 const char *path = argv[i];
586 const char *p;
588 if (allow_options && *path == '-') {
589 if (!strcmp(path, "--")) {
590 allow_options = 0;
591 continue;
593 if (!strcmp(path, "-q")) {
594 refresh_flags |= REFRESH_QUIET;
595 continue;
597 if (!strcmp(path, "--ignore-submodules")) {
598 refresh_flags |= REFRESH_IGNORE_SUBMODULES;
599 continue;
601 if (!strcmp(path, "--add")) {
602 allow_add = 1;
603 continue;
605 if (!strcmp(path, "--replace")) {
606 allow_replace = 1;
607 continue;
609 if (!strcmp(path, "--remove")) {
610 allow_remove = 1;
611 continue;
613 if (!strcmp(path, "--unmerged")) {
614 refresh_flags |= REFRESH_UNMERGED;
615 continue;
617 if (!strcmp(path, "--refresh")) {
618 setup_work_tree();
619 has_errors |= refresh_cache(refresh_flags);
620 continue;
622 if (!strcmp(path, "--really-refresh")) {
623 setup_work_tree();
624 has_errors |= refresh_cache(REFRESH_REALLY | refresh_flags);
625 continue;
627 if (!strcmp(path, "--cacheinfo")) {
628 unsigned char sha1[20];
629 unsigned int mode;
631 if (i+3 >= argc)
632 die("git update-index: --cacheinfo <mode> <sha1> <path>");
634 if (strtoul_ui(argv[i+1], 8, &mode) ||
635 get_sha1_hex(argv[i+2], sha1) ||
636 add_cacheinfo(mode, sha1, argv[i+3], 0))
637 die("git update-index: --cacheinfo"
638 " cannot add %s", argv[i+3]);
639 i += 3;
640 continue;
642 if (!strcmp(path, "--chmod=-x") ||
643 !strcmp(path, "--chmod=+x")) {
644 if (argc <= i+1)
645 die("git update-index: %s <path>", path);
646 set_executable_bit = path[8];
647 continue;
649 if (!strcmp(path, "--assume-unchanged")) {
650 mark_valid_only = MARK_VALID;
651 continue;
653 if (!strcmp(path, "--no-assume-unchanged")) {
654 mark_valid_only = UNMARK_VALID;
655 continue;
657 if (!strcmp(path, "--info-only")) {
658 info_only = 1;
659 continue;
661 if (!strcmp(path, "--force-remove")) {
662 force_remove = 1;
663 continue;
665 if (!strcmp(path, "-z")) {
666 line_termination = 0;
667 continue;
669 if (!strcmp(path, "--stdin")) {
670 if (i != argc - 1)
671 die("--stdin must be at the end");
672 read_from_stdin = 1;
673 break;
675 if (!strcmp(path, "--index-info")) {
676 if (i != argc - 1)
677 die("--index-info must be at the end");
678 allow_add = allow_replace = allow_remove = 1;
679 read_index_info(line_termination);
680 break;
682 if (!strcmp(path, "--unresolve")) {
683 has_errors = do_unresolve(argc - i, argv + i,
684 prefix, prefix_length);
685 if (has_errors)
686 active_cache_changed = 0;
687 goto finish;
689 if (!strcmp(path, "--again") || !strcmp(path, "-g")) {
690 setup_work_tree();
691 has_errors = do_reupdate(argc - i, argv + i,
692 prefix, prefix_length);
693 if (has_errors)
694 active_cache_changed = 0;
695 goto finish;
697 if (!strcmp(path, "--ignore-missing")) {
698 refresh_flags |= REFRESH_IGNORE_MISSING;
699 continue;
701 if (!strcmp(path, "--verbose")) {
702 verbose = 1;
703 continue;
705 if (!strcmp(path, "-h") || !strcmp(path, "--help"))
706 usage(update_index_usage);
707 die("unknown option %s", path);
709 setup_work_tree();
710 p = prefix_path(prefix, prefix_length, path);
711 update_one(p, NULL, 0);
712 if (set_executable_bit)
713 chmod_path(set_executable_bit, p);
714 if (p < path || p > path + strlen(path))
715 free((char *)p);
717 if (read_from_stdin) {
718 struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
720 setup_work_tree();
721 while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
722 const char *p;
723 if (line_termination && buf.buf[0] == '"') {
724 strbuf_reset(&nbuf);
725 if (unquote_c_style(&nbuf, buf.buf, NULL))
726 die("line is badly quoted");
727 strbuf_swap(&buf, &nbuf);
729 p = prefix_path(prefix, prefix_length, buf.buf);
730 update_one(p, NULL, 0);
731 if (set_executable_bit)
732 chmod_path(set_executable_bit, p);
733 if (p < buf.buf || p > buf.buf + buf.len)
734 free((char *)p);
736 strbuf_release(&nbuf);
737 strbuf_release(&buf);
740 finish:
741 if (active_cache_changed) {
742 if (newfd < 0) {
743 if (refresh_flags & REFRESH_QUIET)
744 exit(128);
745 unable_to_lock_index_die(get_index_file(), lock_error);
747 if (write_cache(newfd, active_cache, active_nr) ||
748 commit_locked_index(lock_file))
749 die("Unable to write new index file");
752 rollback_lock_file(lock_file);
754 return has_errors ? 1 : 0;