1/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
6#include "cache.h"
7#include "strbuf.h"
8#include "quote.h"
9#include "cache-tree.h"
10#include "tree-walk.h"
11#include "builtin.h"
12#include "refs.h"
13/*
15 * Default to not allowing changes to the list of files. The
16 * tool doesn't actually care, but this makes it harder to add
17 * files to the revision control by mistake by doing something
18 * like "git-update-index *" and suddenly having all the object
19 * files be revision controlled.
20 */
21static int allow_add;
22static int allow_remove;
23static int allow_replace;
24static int info_only;
25static int force_remove;
26static int verbose;
27static int mark_valid_only;
28#define MARK_VALID 1
29#define UNMARK_VALID 2
30static void report(const char *fmt, ...)
32{
33 va_list vp;
34 if (!verbose)
36 return;
37 va_start(vp, fmt);
39 vprintf(fmt, vp);
40 putchar('\n');
41 va_end(vp);
42}
43static int mark_valid(const char *path)
45{
46 int namelen = strlen(path);
47 int pos = cache_name_pos(path, namelen);
48 if (0 <= pos) {
49 switch (mark_valid_only) {
50 case MARK_VALID:
51 active_cache[pos]->ce_flags |= htons(CE_VALID);
52 break;
53 case UNMARK_VALID:
54 active_cache[pos]->ce_flags &= ~htons(CE_VALID);
55 break;
56 }
57 cache_tree_invalidate_path(active_cache_tree, path);
58 active_cache_changed = 1;
59 return 0;
60 }
61 return -1;
62}
63static int remove_one_path(const char *path)
65{
66 if (!allow_remove)
67 return error("%s: does not exist and --remove not passed", path);
68 if (remove_file_from_cache(path))
69 return error("%s: cannot remove from the index", path);
70 return 0;
71}
72/*
74 * Handle a path that couldn't be lstat'ed. It's either:
75 * - missing file (ENOENT or ENOTDIR). That's ok if we're
76 * supposed to be removing it and the removal actually
77 * succeeds.
78 * - permission error. That's never ok.
79 */
80static int process_lstat_error(const char *path, int err)
81{
82 if (err == ENOENT || err == ENOTDIR)
83 return remove_one_path(path);
84 return error("lstat(\"%s\"): %s", path, strerror(errno));
85}
86static int add_one_path(struct cache_entry *old, const char *path, int len, struct stat *st)
88{
89 int option, size = cache_entry_size(len);
90 struct cache_entry *ce = xcalloc(1, size);
91 memcpy(ce->name, path, len);
93 ce->ce_flags = htons(len);
94 fill_stat_cache_info(ce, st);
95 ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
96 if (index_path(ce->sha1, path, st, !info_only))
98 return -1;
99 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
100 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
101 if (add_cache_entry(ce, option))
102 return error("%s: cannot add to the index - missing --add option?", path);
103 return 0;
104}
105/*
107 * Handle a path that was a directory. Four cases:
108 *
109 * - it's already a gitlink in the index, and we keep it that
110 * way, and update it if we can (if we cannot find the HEAD,
111 * we're going to keep it unchanged in the index!)
112 *
113 * - it's a *file* in the index, in which case it should be
114 * removed as a file if removal is allowed, since it doesn't
115 * exist as such any more. If removal isn't allowed, it's
116 * an error.
117 *
118 * (NOTE! This is old and arguably fairly strange behaviour.
119 * We might want to make this an error unconditionally, and
120 * use "--force-remove" if you actually want to force removal).
121 *
122 * - it used to exist as a subdirectory (ie multiple files with
123 * this particular prefix) in the index, in which case it's wrong
124 * to try to update it as a directory.
125 *
126 * - it doesn't exist at all in the index, but it is a valid
127 * git directory, and it should be *added* as a gitlink.
128 */
129static int process_directory(const char *path, int len, struct stat *st)
130{
131 unsigned char sha1[20];
132 int pos = cache_name_pos(path, len);
133 /* Exact match: file or existing gitlink */
135 if (pos >= 0) {
136 struct cache_entry *ce = active_cache[pos];
137 if (S_ISDIRLNK(ntohl(ce->ce_mode))) {
138 /* Do nothing to the index if there is no HEAD! */
140 if (resolve_gitlink_ref(path, "HEAD", sha1) < 0)
141 return 0;
142 return add_one_path(ce, path, len, st);
144 }
145 /* Should this be an unconditional error? */
146 return remove_one_path(path);
147 }
148 /* Inexact match: is there perhaps a subdirectory match? */
150 pos = -pos-1;
151 while (pos < active_nr) {
152 struct cache_entry *ce = active_cache[pos++];
153 if (strncmp(ce->name, path, len))
155 break;
156 if (ce->name[len] > '/')
157 break;
158 if (ce->name[len] < '/')
159 continue;
160 /* Subdirectory match - error out */
162 return error("%s: is a directory - add individual files instead", path);
163 }
164 /* No match - should we add it as a gitlink? */
166 if (!resolve_gitlink_ref(path, "HEAD", sha1))
167 return add_one_path(NULL, path, len, st);
168 /* Error out. */
170 return error("%s: is a directory - add files inside instead", path);
171}
172/*
174 * Process a regular file
175 */
176static int process_file(const char *path, int len, struct stat *st)
177{
178 int pos = cache_name_pos(path, len);
179 struct cache_entry *ce = pos < 0 ? NULL : active_cache[pos];
180 if (ce && S_ISDIRLNK(ntohl(ce->ce_mode)))
182 return error("%s is already a gitlink, not replacing", path);
183 return add_one_path(ce, path, len, st);
185}
186static int process_path(const char *path)
188{
189 int len;
190 struct stat st;
191 /* We probably want to do this in remove_file_from_cache() and
193 * add_cache_entry() instead...
194 */
195 cache_tree_invalidate_path(active_cache_tree, path);
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 |= htons(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 cache_tree_invalidate_path(active_cache_tree, path);
237 return 0;
238}
239static void chmod_path(int flip, const char *path)
241{
242 int pos;
243 struct cache_entry *ce;
244 unsigned int mode;
245 pos = cache_name_pos(path, strlen(path));
247 if (pos < 0)
248 goto fail;
249 ce = active_cache[pos];
250 mode = ntohl(ce->ce_mode);
251 if (!S_ISREG(mode))
252 goto fail;
253 switch (flip) {
254 case '+':
255 ce->ce_mode |= htonl(0111); break;
256 case '-':
257 ce->ce_mode &= htonl(~0111); break;
258 default:
259 goto fail;
260 }
261 cache_tree_invalidate_path(active_cache_tree, path);
262 active_cache_changed = 1;
263 report("chmod %cx '%s'", flip, path);
264 return;
265 fail:
266 die("git-update-index: cannot chmod %cx '%s'", flip, path);
267}
268static void update_one(const char *path, const char *prefix, int prefix_length)
270{
271 const char *p = prefix_path(prefix, prefix_length, path);
272 if (!verify_path(p)) {
273 fprintf(stderr, "Ignoring path %s\n", path);
274 goto free_return;
275 }
276 if (mark_valid_only) {
277 if (mark_valid(p))
278 die("Unable to mark file %s", path);
279 goto free_return;
280 }
281 cache_tree_invalidate_path(active_cache_tree, path);
282 if (force_remove) {
284 if (remove_file_from_cache(p))
285 die("git-update-index: unable to remove %s", path);
286 report("remove '%s'", path);
287 goto free_return;
288 }
289 if (process_path(p))
290 die("Unable to process path %s", path);
291 report("add '%s'", path);
292 free_return:
293 if (p < path || p > path + strlen(path))
294 free((char*)p);
295}
296static void read_index_info(int line_termination)
298{
299 struct strbuf buf;
300 strbuf_init(&buf);
301 while (1) {
302 char *ptr, *tab;
303 char *path_name;
304 unsigned char sha1[20];
305 unsigned int mode;
306 int stage;
307 /* This reads lines formatted in one of three formats:
309 *
310 * (1) mode SP sha1 TAB path
311 * The first format is what "git-apply --index-info"
312 * reports, and used to reconstruct a partial tree
313 * that is used for phony merge base tree when falling
314 * back on 3-way merge.
315 *
316 * (2) mode SP type SP sha1 TAB path
317 * The second format is to stuff git-ls-tree output
318 * into the index file.
319 *
320 * (3) mode SP sha1 SP stage TAB path
321 * This format is to put higher order stages into the
322 * index file and matches git-ls-files --stage output.
323 */
324 read_line(&buf, stdin, line_termination);
325 if (buf.eof)
326 break;
327 mode = strtoul(buf.buf, &ptr, 8);
329 if (ptr == buf.buf || *ptr != ' ')
330 goto bad_line;
331 tab = strchr(ptr, '\t');
333 if (!tab || tab - ptr < 41)
334 goto bad_line;
335 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
337 stage = tab[-1] - '0';
338 ptr = tab + 1; /* point at the head of path */
339 tab = tab - 2; /* point at tail of sha1 */
340 }
341 else {
342 stage = 0;
343 ptr = tab + 1; /* point at the head of path */
344 }
345 if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
347 goto bad_line;
348 if (line_termination && ptr[0] == '"')
350 path_name = unquote_c_style(ptr, NULL);
351 else
352 path_name = ptr;
353 if (!verify_path(path_name)) {
355 fprintf(stderr, "Ignoring path %s\n", path_name);
356 if (path_name != ptr)
357 free(path_name);
358 continue;
359 }
360 cache_tree_invalidate_path(active_cache_tree, path_name);
361 if (!mode) {
363 /* mode == 0 means there is no such path -- remove */
364 if (remove_file_from_cache(path_name))
365 die("git-update-index: unable to remove %s",
366 ptr);
367 }
368 else {
369 /* mode ' ' sha1 '\t' name
370 * ptr[-1] points at tab,
371 * ptr[-41] is at the beginning of sha1
372 */
373 ptr[-42] = ptr[-1] = 0;
374 if (add_cacheinfo(mode, sha1, path_name, stage))
375 die("git-update-index: unable to update %s",
376 path_name);
377 }
378 if (path_name != ptr)
379 free(path_name);
380 continue;
381 bad_line:
383 die("malformed index info %s", buf.buf);
384 }
385}
386static const char update_index_usage[] =
388"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>...";
389static unsigned char head_sha1[20];
391static unsigned char merge_head_sha1[20];
392static struct cache_entry *read_one_ent(const char *which,
394 unsigned char *ent, const char *path,
395 int namelen, int stage)
396{
397 unsigned mode;
398 unsigned char sha1[20];
399 int size;
400 struct cache_entry *ce;
401 if (get_tree_entry(ent, path, sha1, &mode)) {
403 if (which)
404 error("%s: not in %s branch.", path, which);
405 return NULL;
406 }
407 if (mode == S_IFDIR) {
408 if (which)
409 error("%s: not a blob in %s branch.", path, which);
410 return NULL;
411 }
412 size = cache_entry_size(namelen);
413 ce = xcalloc(1, size);
414 hashcpy(ce->sha1, sha1);
416 memcpy(ce->name, path, namelen);
417 ce->ce_flags = create_ce_flags(namelen, stage);
418 ce->ce_mode = create_ce_mode(mode);
419 return ce;
420}
421static int unresolve_one(const char *path)
423{
424 int namelen = strlen(path);
425 int pos;
426 int ret = 0;
427 struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
428 /* See if there is such entry in the index. */
430 pos = cache_name_pos(path, namelen);
431 if (pos < 0) {
432 /* If there isn't, either it is unmerged, or
433 * resolved as "removed" by mistake. We do not
434 * want to do anything in the former case.
435 */
436 pos = -pos-1;
437 if (pos < active_nr) {
438 struct cache_entry *ce = active_cache[pos];
439 if (ce_namelen(ce) == namelen &&
440 !memcmp(ce->name, path, namelen)) {
441 fprintf(stderr,
442 "%s: skipping still unmerged path.\n",
443 path);
444 goto free_return;
445 }
446 }
447 }
448 /* Grab blobs from given path from HEAD and MERGE_HEAD,
450 * stuff HEAD version in stage #2,
451 * stuff MERGE_HEAD version in stage #3.
452 */
453 ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
454 ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
455 if (!ce_2 || !ce_3) {
457 ret = -1;
458 goto free_return;
459 }
460 if (!hashcmp(ce_2->sha1, ce_3->sha1) &&
461 ce_2->ce_mode == ce_3->ce_mode) {
462 fprintf(stderr, "%s: identical in both, skipping.\n",
463 path);
464 goto free_return;
465 }
466 cache_tree_invalidate_path(active_cache_tree, path);
468 remove_file_from_cache(path);
469 if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
470 error("%s: cannot add our version to the index.", path);
471 ret = -1;
472 goto free_return;
473 }
474 if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
475 return 0;
476 error("%s: cannot add their version to the index.", path);
477 ret = -1;
478 free_return:
479 free(ce_2);
480 free(ce_3);
481 return ret;
482}
483static void read_head_pointers(void)
485{
486 if (read_ref("HEAD", head_sha1))
487 die("No HEAD -- no initial commit yet?\n");
488 if (read_ref("MERGE_HEAD", merge_head_sha1)) {
489 fprintf(stderr, "Not in the middle of a merge.\n");
490 exit(0);
491 }
492}
493static int do_unresolve(int ac, const char **av,
495 const char *prefix, int prefix_length)
496{
497 int i;
498 int err = 0;
499 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
501 * are not doing a merge, so exit with success status.
502 */
503 read_head_pointers();
504 for (i = 1; i < ac; i++) {
506 const char *arg = av[i];
507 const char *p = prefix_path(prefix, prefix_length, arg);
508 err |= unresolve_one(p);
509 if (p < arg || p > arg + strlen(arg))
510 free((char*)p);
511 }
512 return err;
513}
514static int do_reupdate(int ac, const char **av,
516 const char *prefix, int prefix_length)
517{
518 /* Read HEAD and run update-index on paths that are
519 * merged and already different between index and HEAD.
520 */
521 int pos;
522 int has_head = 1;
523 const char **pathspec = get_pathspec(prefix, av + 1);
524 if (read_ref("HEAD", head_sha1))
526 /* If there is no HEAD, that means it is an initial
527 * commit. Update everything in the index.
528 */
529 has_head = 0;
530 redo:
531 for (pos = 0; pos < active_nr; pos++) {
532 struct cache_entry *ce = active_cache[pos];
533 struct cache_entry *old = NULL;
534 int save_nr;
535 if (ce_stage(ce) || !ce_path_match(ce, pathspec))
537 continue;
538 if (has_head)
539 old = read_one_ent(NULL, head_sha1,
540 ce->name, ce_namelen(ce), 0);
541 if (old && ce->ce_mode == old->ce_mode &&
542 !hashcmp(ce->sha1, old->sha1)) {
543 free(old);
544 continue; /* unchanged */
545 }
546 /* Be careful. The working tree may not have the
547 * path anymore, in which case, under 'allow_remove',
548 * or worse yet 'allow_replace', active_nr may decrease.
549 */
550 save_nr = active_nr;
551 update_one(ce->name + prefix_length, prefix, prefix_length);
552 if (save_nr != active_nr)
553 goto redo;
554 }
555 return 0;
556}
557int cmd_update_index(int argc, const char **argv, const char *prefix)
559{
560 int i, newfd, entries, has_errors = 0, line_termination = '\n';
561 int allow_options = 1;
562 int read_from_stdin = 0;
563 int prefix_length = prefix ? strlen(prefix) : 0;
564 char set_executable_bit = 0;
565 unsigned int refresh_flags = 0;
566 int lock_error = 0;
567 struct lock_file *lock_file;
568 git_config(git_default_config);
570 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
572 lock_file = xcalloc(1, sizeof(struct lock_file));
573 newfd = hold_locked_index(lock_file, 0);
575 if (newfd < 0)
576 lock_error = errno;
577 entries = read_cache();
579 if (entries < 0)
580 die("cache corrupted");
581 for (i = 1 ; i < argc; i++) {
583 const char *path = argv[i];
584 const char *p;
585 if (allow_options && *path == '-') {
587 if (!strcmp(path, "--")) {
588 allow_options = 0;
589 continue;
590 }
591 if (!strcmp(path, "-q")) {
592 refresh_flags |= REFRESH_QUIET;
593 continue;
594 }
595 if (!strcmp(path, "--add")) {
596 allow_add = 1;
597 continue;
598 }
599 if (!strcmp(path, "--replace")) {
600 allow_replace = 1;
601 continue;
602 }
603 if (!strcmp(path, "--remove")) {
604 allow_remove = 1;
605 continue;
606 }
607 if (!strcmp(path, "--unmerged")) {
608 refresh_flags |= REFRESH_UNMERGED;
609 continue;
610 }
611 if (!strcmp(path, "--refresh")) {
612 has_errors |= refresh_cache(refresh_flags);
613 continue;
614 }
615 if (!strcmp(path, "--really-refresh")) {
616 has_errors |= refresh_cache(REFRESH_REALLY | refresh_flags);
617 continue;
618 }
619 if (!strcmp(path, "--cacheinfo")) {
620 unsigned char sha1[20];
621 unsigned int mode;
622 if (i+3 >= argc)
624 die("git-update-index: --cacheinfo <mode> <sha1> <path>");
625 if ((sscanf(argv[i+1], "%o", &mode) != 1) ||
627 get_sha1_hex(argv[i+2], sha1) ||
628 add_cacheinfo(mode, sha1, argv[i+3], 0))
629 die("git-update-index: --cacheinfo"
630 " cannot add %s", argv[i+3]);
631 i += 3;
632 continue;
633 }
634 if (!strcmp(path, "--chmod=-x") ||
635 !strcmp(path, "--chmod=+x")) {
636 if (argc <= i+1)
637 die("git-update-index: %s <path>", path);
638 set_executable_bit = path[8];
639 continue;
640 }
641 if (!strcmp(path, "--assume-unchanged")) {
642 mark_valid_only = MARK_VALID;
643 continue;
644 }
645 if (!strcmp(path, "--no-assume-unchanged")) {
646 mark_valid_only = UNMARK_VALID;
647 continue;
648 }
649 if (!strcmp(path, "--info-only")) {
650 info_only = 1;
651 continue;
652 }
653 if (!strcmp(path, "--force-remove")) {
654 force_remove = 1;
655 continue;
656 }
657 if (!strcmp(path, "-z")) {
658 line_termination = 0;
659 continue;
660 }
661 if (!strcmp(path, "--stdin")) {
662 if (i != argc - 1)
663 die("--stdin must be at the end");
664 read_from_stdin = 1;
665 break;
666 }
667 if (!strcmp(path, "--index-info")) {
668 if (i != argc - 1)
669 die("--index-info must be at the end");
670 allow_add = allow_replace = allow_remove = 1;
671 read_index_info(line_termination);
672 break;
673 }
674 if (!strcmp(path, "--unresolve")) {
675 has_errors = do_unresolve(argc - i, argv + i,
676 prefix, prefix_length);
677 if (has_errors)
678 active_cache_changed = 0;
679 goto finish;
680 }
681 if (!strcmp(path, "--again") || !strcmp(path, "-g")) {
682 has_errors = do_reupdate(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, "--ignore-missing")) {
689 refresh_flags |= REFRESH_IGNORE_MISSING;
690 continue;
691 }
692 if (!strcmp(path, "--verbose")) {
693 verbose = 1;
694 continue;
695 }
696 if (!strcmp(path, "-h") || !strcmp(path, "--help"))
697 usage(update_index_usage);
698 die("unknown option %s", path);
699 }
700 p = prefix_path(prefix, prefix_length, path);
701 update_one(p, NULL, 0);
702 if (set_executable_bit)
703 chmod_path(set_executable_bit, p);
704 if (p < path || p > path + strlen(path))
705 free((char*)p);
706 }
707 if (read_from_stdin) {
708 struct strbuf buf;
709 strbuf_init(&buf);
710 while (1) {
711 char *path_name;
712 const char *p;
713 read_line(&buf, stdin, line_termination);
714 if (buf.eof)
715 break;
716 if (line_termination && buf.buf[0] == '"')
717 path_name = unquote_c_style(buf.buf, NULL);
718 else
719 path_name = buf.buf;
720 p = prefix_path(prefix, prefix_length, path_name);
721 update_one(p, NULL, 0);
722 if (set_executable_bit)
723 chmod_path(set_executable_bit, p);
724 if (p < path_name || p > path_name + strlen(path_name))
725 free((char*) p);
726 if (path_name != buf.buf)
727 free(path_name);
728 }
729 }
730 finish:
732 if (active_cache_changed) {
733 if (newfd < 0) {
734 if (refresh_flags & REFRESH_QUIET)
735 exit(128);
736 die("unable to create '%s.lock': %s",
737 get_index_file(), strerror(lock_error));
738 }
739 if (write_cache(newfd, active_cache, active_nr) ||
740 close(newfd) || commit_locked_index(lock_file))
741 die("Unable to write new index file");
742 }
743 rollback_lock_file(lock_file);
745 return has_errors ? 1 : 0;
747}