1/*
2 * GIT - The information manager from hell
3 *
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/*
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.
19 */
20static int allow_add;
21static int allow_remove;
22static int allow_replace;
23static int info_only;
24static int force_remove;
25static int verbose;
26static int mark_valid_only;
27#define MARK_VALID 1
28#define UNMARK_VALID 2
29static void report(const char *fmt, ...)
31{
32 va_list vp;
33 if (!verbose)
35 return;
36 va_start(vp, fmt);
38 vprintf(fmt, vp);
39 putchar('\n');
40 va_end(vp);
41}
42static int mark_valid(const char *path)
44{
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;
55 }
56 cache_tree_invalidate_path(active_cache_tree, path);
57 active_cache_changed = 1;
58 return 0;
59 }
60 return -1;
61}
62static int remove_one_path(const char *path)
64{
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;
70}
71/*
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.
78 */
79static int process_lstat_error(const char *path, int err)
80{
81 if (err == ENOENT || err == ENOTDIR)
82 return remove_one_path(path);
83 return error("lstat(\"%s\"): %s", path, strerror(errno));
84}
85static int add_one_path(struct cache_entry *old, const char *path, int len, struct stat *st)
87{
88 int option, size;
89 struct cache_entry *ce;
90 /* Was the old index entry already up-to-date? */
92 if (old && !ce_stage(old) && !ce_match_stat(old, st, 0))
93 return 0;
94 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);
101 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;
109}
110/*
112 * Handle a path that was a directory. Four cases:
113 *
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!)
117 *
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.
122 *
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).
126 *
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.
130 *
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.
133 */
134static int process_directory(const char *path, int len, struct stat *st)
135{
136 unsigned char sha1[20];
137 int pos = cache_name_pos(path, len);
138 /* 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)) {
143 /* Do nothing to the index if there is no HEAD! */
145 if (resolve_gitlink_ref(path, "HEAD", sha1) < 0)
146 return 0;
147 return add_one_path(ce, path, len, st);
149 }
150 /* Should this be an unconditional error? */
151 return remove_one_path(path);
152 }
153 /* 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++];
158 if (strncmp(ce->name, path, len))
160 break;
161 if (ce->name[len] > '/')
162 break;
163 if (ce->name[len] < '/')
164 continue;
165 /* Subdirectory match - error out */
167 return error("%s: is a directory - add individual files instead", path);
168 }
169 /* 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);
173 /* Error out. */
175 return error("%s: is a directory - add files inside instead", path);
176}
177/*
179 * Process a regular file
180 */
181static int process_file(const char *path, int len, struct stat *st)
182{
183 int pos = cache_name_pos(path, len);
184 struct cache_entry *ce = pos < 0 ? NULL : active_cache[pos];
185 if (ce && S_ISGITLINK(ce->ce_mode))
187 return error("%s is already a gitlink, not replacing", path);
188 return add_one_path(ce, path, len, st);
190}
191static int process_path(const char *path)
193{
194 int len;
195 struct stat st;
196 /*
198 * First things first: get the stat information, to decide
199 * what to do about the pathname!
200 */
201 if (lstat(path, &st) < 0)
202 return process_lstat_error(path, errno);
203 len = strlen(path);
205 if (S_ISDIR(st.st_mode))
206 return process_directory(path, len, &st);
207 return process_file(path, len, &st);
209}
210static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
212 const char *path, int stage)
213{
214 int size, len, option;
215 struct cache_entry *ce;
216 if (!verify_path(path))
218 return -1;
219 len = strlen(path);
221 size = cache_entry_size(len);
222 ce = xcalloc(1, size);
223 hashcpy(ce->sha1, sha1);
225 memcpy(ce->name, path, len);
226 ce->ce_flags = create_ce_flags(len, stage);
227 ce->ce_mode = create_ce_mode(mode);
228 if (assume_unchanged)
229 ce->ce_flags |= CE_VALID;
230 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
231 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
232 if (add_cache_entry(ce, option))
233 return error("%s: cannot add to the index - missing --add option?",
234 path);
235 report("add '%s'", path);
236 return 0;
237}
238static void chmod_path(int flip, const char *path)
240{
241 int pos;
242 struct cache_entry *ce;
243 unsigned int mode;
244 pos = cache_name_pos(path, strlen(path));
246 if (pos < 0)
247 goto fail;
248 ce = active_cache[pos];
249 mode = ce->ce_mode;
250 if (!S_ISREG(mode))
251 goto fail;
252 switch (flip) {
253 case '+':
254 ce->ce_mode |= 0111; break;
255 case '-':
256 ce->ce_mode &= ~0111; break;
257 default:
258 goto fail;
259 }
260 cache_tree_invalidate_path(active_cache_tree, path);
261 active_cache_changed = 1;
262 report("chmod %cx '%s'", flip, path);
263 return;
264 fail:
265 die("git update-index: cannot chmod %cx '%s'", flip, path);
266}
267static void update_one(const char *path, const char *prefix, int prefix_length)
269{
270 const char *p = prefix_path(prefix, prefix_length, path);
271 if (!verify_path(p)) {
272 fprintf(stderr, "Ignoring path %s\n", path);
273 goto free_return;
274 }
275 if (mark_valid_only) {
276 if (mark_valid(p))
277 die("Unable to mark file %s", path);
278 goto free_return;
279 }
280 if (force_remove) {
282 if (remove_file_from_cache(p))
283 die("git update-index: unable to remove %s", path);
284 report("remove '%s'", path);
285 goto free_return;
286 }
287 if (process_path(p))
288 die("Unable to process path %s", path);
289 report("add '%s'", path);
290 free_return:
291 if (p < path || p > path + strlen(path))
292 free((char*)p);
293}
294static void read_index_info(int line_termination)
296{
297 struct strbuf buf;
298 struct strbuf uq;
299 strbuf_init(&buf, 0);
301 strbuf_init(&uq, 0);
302 while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
303 char *ptr, *tab;
304 char *path_name;
305 unsigned char sha1[20];
306 unsigned int mode;
307 unsigned long ul;
308 int stage;
309 /* This reads lines formatted in one of three formats:
311 *
312 * (1) mode SP sha1 TAB path
313 * The first format is what "git-apply --index-info"
314 * reports, and used to reconstruct a partial tree
315 * that is used for phony merge base tree when falling
316 * back on 3-way merge.
317 *
318 * (2) mode SP type SP sha1 TAB path
319 * The second format is to stuff git-ls-tree output
320 * into the index file.
321 *
322 * (3) mode SP sha1 SP stage TAB path
323 * This format is to put higher order stages into the
324 * index file and matches git-ls-files --stage output.
325 */
326 errno = 0;
327 ul = strtoul(buf.buf, &ptr, 8);
328 if (ptr == buf.buf || *ptr != ' '
329 || errno || (unsigned int) ul != ul)
330 goto bad_line;
331 mode = ul;
332 tab = strchr(ptr, '\t');
334 if (!tab || tab - ptr < 41)
335 goto bad_line;
336 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
338 stage = tab[-1] - '0';
339 ptr = tab + 1; /* point at the head of path */
340 tab = tab - 2; /* point at tail of sha1 */
341 }
342 else {
343 stage = 0;
344 ptr = tab + 1; /* point at the head of path */
345 }
346 if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
348 goto bad_line;
349 path_name = ptr;
351 if (line_termination && path_name[0] == '"') {
352 strbuf_reset(&uq);
353 if (unquote_c_style(&uq, path_name, NULL)) {
354 die("git update-index: bad quoting of path name");
355 }
356 path_name = uq.buf;
357 }
358 if (!verify_path(path_name)) {
360 fprintf(stderr, "Ignoring path %s\n", path_name);
361 continue;
362 }
363 if (!mode) {
365 /* mode == 0 means there is no such path -- remove */
366 if (remove_file_from_cache(path_name))
367 die("git update-index: unable to remove %s",
368 ptr);
369 }
370 else {
371 /* mode ' ' sha1 '\t' name
372 * ptr[-1] points at tab,
373 * ptr[-41] is at the beginning of sha1
374 */
375 ptr[-42] = ptr[-1] = 0;
376 if (add_cacheinfo(mode, sha1, path_name, stage))
377 die("git update-index: unable to update %s",
378 path_name);
379 }
380 continue;
381 bad_line:
383 die("malformed index info %s", buf.buf);
384 }
385 strbuf_release(&buf);
386 strbuf_release(&uq);
387}
388static const char update_index_usage[] =
390"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>...";
391static unsigned char head_sha1[20];
393static unsigned char merge_head_sha1[20];
394static struct cache_entry *read_one_ent(const char *which,
396 unsigned char *ent, const char *path,
397 int namelen, int stage)
398{
399 unsigned mode;
400 unsigned char sha1[20];
401 int size;
402 struct cache_entry *ce;
403 if (get_tree_entry(ent, path, sha1, &mode)) {
405 if (which)
406 error("%s: not in %s branch.", path, which);
407 return NULL;
408 }
409 if (mode == S_IFDIR) {
410 if (which)
411 error("%s: not a blob in %s branch.", path, which);
412 return NULL;
413 }
414 size = cache_entry_size(namelen);
415 ce = xcalloc(1, size);
416 hashcpy(ce->sha1, sha1);
418 memcpy(ce->name, path, namelen);
419 ce->ce_flags = create_ce_flags(namelen, stage);
420 ce->ce_mode = create_ce_mode(mode);
421 return ce;
422}
423static int unresolve_one(const char *path)
425{
426 int namelen = strlen(path);
427 int pos;
428 int ret = 0;
429 struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
430 /* See if there is such entry in the index. */
432 pos = cache_name_pos(path, namelen);
433 if (pos < 0) {
434 /* If there isn't, either it is unmerged, or
435 * resolved as "removed" by mistake. We do not
436 * want to do anything in the former case.
437 */
438 pos = -pos-1;
439 if (pos < active_nr) {
440 struct cache_entry *ce = active_cache[pos];
441 if (ce_namelen(ce) == namelen &&
442 !memcmp(ce->name, path, namelen)) {
443 fprintf(stderr,
444 "%s: skipping still unmerged path.\n",
445 path);
446 goto free_return;
447 }
448 }
449 }
450 /* Grab blobs from given path from HEAD and MERGE_HEAD,
452 * stuff HEAD version in stage #2,
453 * stuff MERGE_HEAD version in stage #3.
454 */
455 ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
456 ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
457 if (!ce_2 || !ce_3) {
459 ret = -1;
460 goto free_return;
461 }
462 if (!hashcmp(ce_2->sha1, ce_3->sha1) &&
463 ce_2->ce_mode == ce_3->ce_mode) {
464 fprintf(stderr, "%s: identical in both, skipping.\n",
465 path);
466 goto free_return;
467 }
468 remove_file_from_cache(path);
470 if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
471 error("%s: cannot add our version to the index.", path);
472 ret = -1;
473 goto free_return;
474 }
475 if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
476 return 0;
477 error("%s: cannot add their version to the index.", path);
478 ret = -1;
479 free_return:
480 free(ce_2);
481 free(ce_3);
482 return ret;
483}
484static void read_head_pointers(void)
486{
487 if (read_ref("HEAD", head_sha1))
488 die("No HEAD -- no initial commit yet?\n");
489 if (read_ref("MERGE_HEAD", merge_head_sha1)) {
490 fprintf(stderr, "Not in the middle of a merge.\n");
491 exit(0);
492 }
493}
494static int do_unresolve(int ac, const char **av,
496 const char *prefix, int prefix_length)
497{
498 int i;
499 int err = 0;
500 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
502 * are not doing a merge, so exit with success status.
503 */
504 read_head_pointers();
505 for (i = 1; i < ac; i++) {
507 const char *arg = av[i];
508 const char *p = prefix_path(prefix, prefix_length, arg);
509 err |= unresolve_one(p);
510 if (p < arg || p > arg + strlen(arg))
511 free((char*)p);
512 }
513 return err;
514}
515static int do_reupdate(int ac, const char **av,
517 const char *prefix, int prefix_length)
518{
519 /* Read HEAD and run update-index on paths that are
520 * merged and already different between index and HEAD.
521 */
522 int pos;
523 int has_head = 1;
524 const char **pathspec = get_pathspec(prefix, av + 1);
525 if (read_ref("HEAD", head_sha1))
527 /* If there is no HEAD, that means it is an initial
528 * commit. Update everything in the index.
529 */
530 has_head = 0;
531 redo:
532 for (pos = 0; pos < active_nr; pos++) {
533 struct cache_entry *ce = active_cache[pos];
534 struct cache_entry *old = NULL;
535 int save_nr;
536 if (ce_stage(ce) || !ce_path_match(ce, pathspec))
538 continue;
539 if (has_head)
540 old = read_one_ent(NULL, head_sha1,
541 ce->name, ce_namelen(ce), 0);
542 if (old && ce->ce_mode == old->ce_mode &&
543 !hashcmp(ce->sha1, old->sha1)) {
544 free(old);
545 continue; /* unchanged */
546 }
547 /* Be careful. The working tree may not have the
548 * path anymore, in which case, under 'allow_remove',
549 * or worse yet 'allow_replace', active_nr may decrease.
550 */
551 save_nr = active_nr;
552 update_one(ce->name + prefix_length, prefix, prefix_length);
553 if (save_nr != active_nr)
554 goto redo;
555 }
556 return 0;
557}
558int cmd_update_index(int argc, const char **argv, const char *prefix)
560{
561 int i, newfd, entries, has_errors = 0, line_termination = '\n';
562 int allow_options = 1;
563 int read_from_stdin = 0;
564 int prefix_length = prefix ? strlen(prefix) : 0;
565 char set_executable_bit = 0;
566 unsigned int refresh_flags = 0;
567 int lock_error = 0;
568 struct lock_file *lock_file;
569 git_config(git_default_config, NULL);
571 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
573 lock_file = xcalloc(1, sizeof(struct lock_file));
574 newfd = hold_locked_index(lock_file, 0);
576 if (newfd < 0)
577 lock_error = errno;
578 entries = read_cache();
580 if (entries < 0)
581 die("cache corrupted");
582 for (i = 1 ; i < argc; i++) {
584 const char *path = argv[i];
585 const char *p;
586 if (allow_options && *path == '-') {
588 if (!strcmp(path, "--")) {
589 allow_options = 0;
590 continue;
591 }
592 if (!strcmp(path, "-q")) {
593 refresh_flags |= REFRESH_QUIET;
594 continue;
595 }
596 if (!strcmp(path, "--ignore-submodules")) {
597 refresh_flags |= REFRESH_IGNORE_SUBMODULES;
598 continue;
599 }
600 if (!strcmp(path, "--add")) {
601 allow_add = 1;
602 continue;
603 }
604 if (!strcmp(path, "--replace")) {
605 allow_replace = 1;
606 continue;
607 }
608 if (!strcmp(path, "--remove")) {
609 allow_remove = 1;
610 continue;
611 }
612 if (!strcmp(path, "--unmerged")) {
613 refresh_flags |= REFRESH_UNMERGED;
614 continue;
615 }
616 if (!strcmp(path, "--refresh")) {
617 setup_work_tree();
618 has_errors |= refresh_cache(refresh_flags);
619 continue;
620 }
621 if (!strcmp(path, "--really-refresh")) {
622 setup_work_tree();
623 has_errors |= refresh_cache(REFRESH_REALLY | refresh_flags);
624 continue;
625 }
626 if (!strcmp(path, "--cacheinfo")) {
627 unsigned char sha1[20];
628 unsigned int mode;
629 if (i+3 >= argc)
631 die("git update-index: --cacheinfo <mode> <sha1> <path>");
632 if (strtoul_ui(argv[i+1], 8, &mode) ||
634 get_sha1_hex(argv[i+2], sha1) ||
635 add_cacheinfo(mode, sha1, argv[i+3], 0))
636 die("git update-index: --cacheinfo"
637 " cannot add %s", argv[i+3]);
638 i += 3;
639 continue;
640 }
641 if (!strcmp(path, "--chmod=-x") ||
642 !strcmp(path, "--chmod=+x")) {
643 if (argc <= i+1)
644 die("git update-index: %s <path>", path);
645 set_executable_bit = path[8];
646 continue;
647 }
648 if (!strcmp(path, "--assume-unchanged")) {
649 mark_valid_only = MARK_VALID;
650 continue;
651 }
652 if (!strcmp(path, "--no-assume-unchanged")) {
653 mark_valid_only = UNMARK_VALID;
654 continue;
655 }
656 if (!strcmp(path, "--info-only")) {
657 info_only = 1;
658 continue;
659 }
660 if (!strcmp(path, "--force-remove")) {
661 force_remove = 1;
662 continue;
663 }
664 if (!strcmp(path, "-z")) {
665 line_termination = 0;
666 continue;
667 }
668 if (!strcmp(path, "--stdin")) {
669 if (i != argc - 1)
670 die("--stdin must be at the end");
671 read_from_stdin = 1;
672 break;
673 }
674 if (!strcmp(path, "--index-info")) {
675 if (i != argc - 1)
676 die("--index-info must be at the end");
677 allow_add = allow_replace = allow_remove = 1;
678 read_index_info(line_termination);
679 break;
680 }
681 if (!strcmp(path, "--unresolve")) {
682 has_errors = do_unresolve(argc - i, argv + i,
683 prefix, prefix_length);
684 if (has_errors)
685 active_cache_changed = 0;
686 goto finish;
687 }
688 if (!strcmp(path, "--again") || !strcmp(path, "-g")) {
689 setup_work_tree();
690 has_errors = do_reupdate(argc - i, argv + i,
691 prefix, prefix_length);
692 if (has_errors)
693 active_cache_changed = 0;
694 goto finish;
695 }
696 if (!strcmp(path, "--ignore-missing")) {
697 refresh_flags |= REFRESH_IGNORE_MISSING;
698 continue;
699 }
700 if (!strcmp(path, "--verbose")) {
701 verbose = 1;
702 continue;
703 }
704 if (!strcmp(path, "-h") || !strcmp(path, "--help"))
705 usage(update_index_usage);
706 die("unknown option %s", path);
707 }
708 setup_work_tree();
709 p = prefix_path(prefix, prefix_length, path);
710 update_one(p, NULL, 0);
711 if (set_executable_bit)
712 chmod_path(set_executable_bit, p);
713 if (p < path || p > path + strlen(path))
714 free((char*)p);
715 }
716 if (read_from_stdin) {
717 struct strbuf buf, nbuf;
718 strbuf_init(&buf, 0);
720 strbuf_init(&nbuf, 0);
721 setup_work_tree();
722 while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
723 const char *p;
724 if (line_termination && buf.buf[0] == '"') {
725 strbuf_reset(&nbuf);
726 if (unquote_c_style(&nbuf, buf.buf, NULL))
727 die("line is badly quoted");
728 strbuf_swap(&buf, &nbuf);
729 }
730 p = prefix_path(prefix, prefix_length, buf.buf);
731 update_one(p, NULL, 0);
732 if (set_executable_bit)
733 chmod_path(set_executable_bit, p);
734 if (p < buf.buf || p > buf.buf + buf.len)
735 free((char *)p);
736 }
737 strbuf_release(&nbuf);
738 strbuf_release(&buf);
739 }
740 finish:
742 if (active_cache_changed) {
743 if (newfd < 0) {
744 if (refresh_flags & REFRESH_QUIET)
745 exit(128);
746 die("unable to create '%s.lock': %s",
747 get_index_file(), strerror(lock_error));
748 }
749 if (write_cache(newfd, active_cache, active_nr) ||
750 commit_locked_index(lock_file))
751 die("Unable to write new index file");
752 }
753 rollback_lock_file(lock_file);
755 return has_errors ? 1 : 0;
757}