2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
9 #include "cache-tree.h"
10 #include "tree-walk.h"
13 * Default to not allowing changes to the list of files. The
14 * tool doesn't actually care, but this makes it harder to add
15 * files to the revision control by mistake by doing something
16 * like "git-update-index *" and suddenly having all the object
17 * files be revision controlled.
20 static int allow_remove;
21 static int allow_replace;
23 static int force_remove;
25 static int mark_valid_only = 0;
27 #define UNMARK_VALID 2
29 static void report(const char *fmt, ...)
42 static int mark_valid(const char *path)
44 int namelen = strlen(path);
45 int pos = cache_name_pos(path, namelen);
47 switch (mark_valid_only) {
49 active_cache[pos]->ce_flags |= htons(CE_VALID);
52 active_cache[pos]->ce_flags &= ~htons(CE_VALID);
55 cache_tree_invalidate_path(active_cache_tree, path);
56 active_cache_changed = 1;
62 static int add_file_to_cache(const char *path)
64 int size, namelen, option, status;
65 struct cache_entry *ce;
68 status = lstat(path, &st);
70 /* We probably want to do this in remove_file_from_cache() and
71 * add_cache_entry() instead...
73 cache_tree_invalidate_path(active_cache_tree, path);
75 if (status < 0 || S_ISDIR(st.st_mode)) {
76 /* When we used to have "path" and now we want to add
77 * "path/file", we need a way to remove "path" before
78 * being able to add "path/file". However,
79 * "git-update-index --remove path" would not work.
80 * --force-remove can be used but this is more user
81 * friendly, especially since we can do the opposite
82 * case just fine without --force-remove.
84 if (status == 0 || (errno == ENOENT || errno == ENOTDIR)) {
86 if (remove_file_from_cache(path))
87 return error("%s: cannot remove from the index",
91 } else if (status < 0) {
92 return error("%s: does not exist and --remove not passed",
97 return error("%s: is a directory - add files inside instead",
100 return error("lstat(\"%s\"): %s", path,
104 namelen = strlen(path);
105 size = cache_entry_size(namelen);
106 ce = xcalloc(1, size);
107 memcpy(ce->name, path, namelen);
108 ce->ce_flags = htons(namelen);
109 fill_stat_cache_info(ce, &st);
111 ce->ce_mode = create_ce_mode(st.st_mode);
112 if (!trust_executable_bit) {
113 /* If there is an existing entry, pick the mode bits
116 int pos = cache_name_pos(path, namelen);
118 ce->ce_mode = active_cache[pos]->ce_mode;
121 if (index_path(ce->sha1, path, &st, !info_only))
123 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
124 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
125 if (add_cache_entry(ce, option))
126 return error("%s: cannot add to the index - missing --add option?",
132 * We fundamentally don't like some paths: we don't want
133 * dot or dot-dot anywhere, and for obvious reasons don't
134 * want to recurse into ".git" either.
136 * Also, we don't want double slashes or slashes at the
137 * end that can make pathnames ambiguous.
139 static int verify_dotfile(const char *rest)
142 * The first character was '.', but that
143 * has already been discarded, we now test
147 /* "." is not allowed */
152 * ".git" followed by NUL or slash is bad. This
153 * shares the path end test with the ".." case.
163 if (rest[1] == '\0' || rest[1] == '/')
169 static int verify_path(const char *path)
186 if (verify_dotfile(path))
195 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
196 const char *path, int stage)
198 int size, len, option;
199 struct cache_entry *ce;
201 if (!verify_path(path))
205 size = cache_entry_size(len);
206 ce = xcalloc(1, size);
208 memcpy(ce->sha1, sha1, 20);
209 memcpy(ce->name, path, len);
210 ce->ce_flags = create_ce_flags(len, stage);
211 ce->ce_mode = create_ce_mode(mode);
212 if (assume_unchanged)
213 ce->ce_flags |= htons(CE_VALID);
214 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
215 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
216 if (add_cache_entry(ce, option))
217 return error("%s: cannot add to the index - missing --add option?",
219 report("add '%s'", path);
220 cache_tree_invalidate_path(active_cache_tree, path);
224 static void chmod_path(int flip, const char *path)
227 struct cache_entry *ce;
230 pos = cache_name_pos(path, strlen(path));
233 ce = active_cache[pos];
234 mode = ntohl(ce->ce_mode);
239 ce->ce_mode |= htonl(0111); break;
241 ce->ce_mode &= htonl(~0111); break;
245 cache_tree_invalidate_path(active_cache_tree, path);
246 active_cache_changed = 1;
247 report("chmod %cx '%s'", flip, path);
250 die("git-update-index: cannot chmod %cx '%s'", flip, path);
253 static struct cache_file cache_file;
255 static void update_one(const char *path, const char *prefix, int prefix_length)
257 const char *p = prefix_path(prefix, prefix_length, path);
258 if (!verify_path(p)) {
259 fprintf(stderr, "Ignoring path %s\n", path);
262 if (mark_valid_only) {
264 die("Unable to mark file %s", path);
267 cache_tree_invalidate_path(active_cache_tree, path);
270 if (remove_file_from_cache(p))
271 die("git-update-index: unable to remove %s", path);
272 report("remove '%s'", path);
275 if (add_file_to_cache(p))
276 die("Unable to process file %s", path);
277 report("add '%s'", path);
279 if (p < path || p > path + strlen(path))
283 static void read_index_info(int line_termination)
290 unsigned char sha1[20];
294 /* This reads lines formatted in one of three formats:
296 * (1) mode SP sha1 TAB path
297 * The first format is what "git-apply --index-info"
298 * reports, and used to reconstruct a partial tree
299 * that is used for phony merge base tree when falling
300 * back on 3-way merge.
302 * (2) mode SP type SP sha1 TAB path
303 * The second format is to stuff git-ls-tree output
304 * into the index file.
306 * (3) mode SP sha1 SP stage TAB path
307 * This format is to put higher order stages into the
308 * index file and matches git-ls-files --stage output.
310 read_line(&buf, stdin, line_termination);
314 mode = strtoul(buf.buf, &ptr, 8);
315 if (ptr == buf.buf || *ptr != ' ')
318 tab = strchr(ptr, '\t');
319 if (!tab || tab - ptr < 41)
322 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
323 stage = tab[-1] - '0';
324 ptr = tab + 1; /* point at the head of path */
325 tab = tab - 2; /* point at tail of sha1 */
329 ptr = tab + 1; /* point at the head of path */
332 if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
335 if (line_termination && ptr[0] == '"')
336 path_name = unquote_c_style(ptr, NULL);
340 if (!verify_path(path_name)) {
341 fprintf(stderr, "Ignoring path %s\n", path_name);
342 if (path_name != ptr)
346 cache_tree_invalidate_path(active_cache_tree, path_name);
349 /* mode == 0 means there is no such path -- remove */
350 if (remove_file_from_cache(path_name))
351 die("git-update-index: unable to remove %s",
355 /* mode ' ' sha1 '\t' name
356 * ptr[-1] points at tab,
357 * ptr[-41] is at the beginning of sha1
359 ptr[-42] = ptr[-1] = 0;
360 if (add_cacheinfo(mode, sha1, path_name, stage))
361 die("git-update-index: unable to update %s",
364 if (path_name != ptr)
369 die("malformed index info %s", buf.buf);
373 static const char update_index_usage[] =
374 "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] [--ignore-missing] [-z] [--verbose] [--] <file>...";
376 static unsigned char head_sha1[20];
377 static unsigned char merge_head_sha1[20];
379 static struct cache_entry *read_one_ent(const char *which,
380 unsigned char *ent, const char *path,
381 int namelen, int stage)
384 unsigned char sha1[20];
386 struct cache_entry *ce;
388 if (get_tree_entry(ent, path, sha1, &mode)) {
390 error("%s: not in %s branch.", path, which);
393 if (mode == S_IFDIR) {
395 error("%s: not a blob in %s branch.", path, which);
398 size = cache_entry_size(namelen);
399 ce = xcalloc(1, size);
401 memcpy(ce->sha1, sha1, 20);
402 memcpy(ce->name, path, namelen);
403 ce->ce_flags = create_ce_flags(namelen, stage);
404 ce->ce_mode = create_ce_mode(mode);
408 static int unresolve_one(const char *path)
410 int namelen = strlen(path);
413 struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
415 /* See if there is such entry in the index. */
416 pos = cache_name_pos(path, namelen);
418 /* If there isn't, either it is unmerged, or
419 * resolved as "removed" by mistake. We do not
420 * want to do anything in the former case.
423 if (pos < active_nr) {
424 struct cache_entry *ce = active_cache[pos];
425 if (ce_namelen(ce) == namelen &&
426 !memcmp(ce->name, path, namelen)) {
428 "%s: skipping still unmerged path.\n",
435 /* Grab blobs from given path from HEAD and MERGE_HEAD,
436 * stuff HEAD version in stage #2,
437 * stuff MERGE_HEAD version in stage #3.
439 ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
440 ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
442 if (!ce_2 || !ce_3) {
446 if (!memcmp(ce_2->sha1, ce_3->sha1, 20) &&
447 ce_2->ce_mode == ce_3->ce_mode) {
448 fprintf(stderr, "%s: identical in both, skipping.\n",
453 cache_tree_invalidate_path(active_cache_tree, path);
454 remove_file_from_cache(path);
455 if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
456 error("%s: cannot add our version to the index.", path);
460 if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
462 error("%s: cannot add their version to the index.", path);
470 static void read_head_pointers(void)
472 if (read_ref(git_path("HEAD"), head_sha1))
473 die("No HEAD -- no initial commit yet?\n");
474 if (read_ref(git_path("MERGE_HEAD"), merge_head_sha1)) {
475 fprintf(stderr, "Not in the middle of a merge.\n");
480 static int do_unresolve(int ac, const char **av,
481 const char *prefix, int prefix_length)
486 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
487 * are not doing a merge, so exit with success status.
489 read_head_pointers();
491 for (i = 1; i < ac; i++) {
492 const char *arg = av[i];
493 const char *p = prefix_path(prefix, prefix_length, arg);
494 err |= unresolve_one(p);
495 if (p < arg || p > arg + strlen(arg))
501 static int do_reupdate(int ac, const char **av,
502 const char *prefix, int prefix_length)
504 /* Read HEAD and run update-index on paths that are
505 * merged and already different between index and HEAD.
509 const char **pathspec = get_pathspec(prefix, av + 1);
511 if (read_ref(git_path("HEAD"), head_sha1))
512 /* If there is no HEAD, that means it is an initial
513 * commit. Update everything in the index.
517 for (pos = 0; pos < active_nr; pos++) {
518 struct cache_entry *ce = active_cache[pos];
519 struct cache_entry *old = NULL;
522 if (ce_stage(ce) || !ce_path_match(ce, pathspec))
525 old = read_one_ent(NULL, head_sha1,
526 ce->name, ce_namelen(ce), 0);
527 if (old && ce->ce_mode == old->ce_mode &&
528 !memcmp(ce->sha1, old->sha1, 20)) {
530 continue; /* unchanged */
532 /* Be careful. The working tree may not have the
533 * path anymore, in which case, under 'allow_remove',
534 * or worse yet 'allow_replace', active_nr may decrease.
537 update_one(ce->name + prefix_length, prefix, prefix_length);
538 if (save_nr != active_nr)
544 int main(int argc, const char **argv)
546 int i, newfd, entries, has_errors = 0, line_termination = '\n';
547 int allow_options = 1;
548 int read_from_stdin = 0;
549 const char *prefix = setup_git_directory();
550 int prefix_length = prefix ? strlen(prefix) : 0;
551 char set_executable_bit = 0;
552 unsigned int refresh_flags = 0;
554 git_config(git_default_config);
556 newfd = hold_index_file_for_update(&cache_file, get_index_file());
558 die("unable to create new cachefile");
560 entries = read_cache();
562 die("cache corrupted");
564 for (i = 1 ; i < argc; i++) {
565 const char *path = argv[i];
567 if (allow_options && *path == '-') {
568 if (!strcmp(path, "--")) {
572 if (!strcmp(path, "-q")) {
573 refresh_flags |= REFRESH_QUIET;
576 if (!strcmp(path, "--add")) {
580 if (!strcmp(path, "--replace")) {
584 if (!strcmp(path, "--remove")) {
588 if (!strcmp(path, "--unmerged")) {
589 refresh_flags |= REFRESH_UNMERGED;
592 if (!strcmp(path, "--refresh")) {
593 has_errors |= refresh_cache(refresh_flags);
596 if (!strcmp(path, "--really-refresh")) {
597 has_errors |= refresh_cache(REFRESH_REALLY | refresh_flags);
600 if (!strcmp(path, "--cacheinfo")) {
601 unsigned char sha1[20];
605 die("git-update-index: --cacheinfo <mode> <sha1> <path>");
607 if ((sscanf(argv[i+1], "%o", &mode) != 1) ||
608 get_sha1_hex(argv[i+2], sha1) ||
609 add_cacheinfo(mode, sha1, argv[i+3], 0))
610 die("git-update-index: --cacheinfo"
611 " cannot add %s", argv[i+3]);
615 if (!strcmp(path, "--chmod=-x") ||
616 !strcmp(path, "--chmod=+x")) {
618 die("git-update-index: %s <path>", path);
619 set_executable_bit = path[8];
622 if (!strcmp(path, "--assume-unchanged")) {
623 mark_valid_only = MARK_VALID;
626 if (!strcmp(path, "--no-assume-unchanged")) {
627 mark_valid_only = UNMARK_VALID;
630 if (!strcmp(path, "--info-only")) {
634 if (!strcmp(path, "--force-remove")) {
638 if (!strcmp(path, "-z")) {
639 line_termination = 0;
642 if (!strcmp(path, "--stdin")) {
644 die("--stdin must be at the end");
648 if (!strcmp(path, "--index-info")) {
650 die("--index-info must be at the end");
651 allow_add = allow_replace = allow_remove = 1;
652 read_index_info(line_termination);
655 if (!strcmp(path, "--unresolve")) {
656 has_errors = do_unresolve(argc - i, argv + i,
657 prefix, prefix_length);
659 active_cache_changed = 0;
662 if (!strcmp(path, "--again")) {
663 has_errors = do_reupdate(argc - i, argv + i,
664 prefix, prefix_length);
666 active_cache_changed = 0;
669 if (!strcmp(path, "--ignore-missing")) {
670 refresh_flags |= REFRESH_IGNORE_MISSING;
673 if (!strcmp(path, "--verbose")) {
677 if (!strcmp(path, "-h") || !strcmp(path, "--help"))
678 usage(update_index_usage);
679 die("unknown option %s", path);
681 update_one(path, prefix, prefix_length);
682 if (set_executable_bit)
683 chmod_path(set_executable_bit, path);
685 if (read_from_stdin) {
691 read_line(&buf, stdin, line_termination);
694 if (line_termination && buf.buf[0] == '"')
695 path_name = unquote_c_style(buf.buf, NULL);
698 p = prefix_path(prefix, prefix_length, path_name);
699 update_one(p, NULL, 0);
700 if (set_executable_bit)
701 chmod_path(set_executable_bit, p);
702 if (p < path_name || p > path_name + strlen(path_name))
704 if (path_name != buf.buf)
710 if (active_cache_changed) {
711 if (write_cache(newfd, active_cache, active_nr) ||
712 commit_index_file(&cache_file))
713 die("Unable to write new cachefile");
716 return has_errors ? 1 : 0;