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
;
22 static int allow_unmerged
; /* --refresh needing merge is not error */
23 static int not_new
; /* --refresh not having working tree files is not error */
24 static int quiet
; /* --refresh needing update is not error */
26 static int force_remove
;
28 static int mark_valid_only
= 0;
30 #define UNMARK_VALID 2
33 /* Three functions to allow overloaded pointer return; see linux/err.h */
34 static inline void *ERR_PTR(long error
)
36 return (void *) error
;
39 static inline long PTR_ERR(const void *ptr
)
44 static inline long IS_ERR(const void *ptr
)
46 return (unsigned long)ptr
> (unsigned long)-1000L;
49 static void report(const char *fmt
, ...)
62 static int mark_valid(const char *path
)
64 int namelen
= strlen(path
);
65 int pos
= cache_name_pos(path
, namelen
);
67 switch (mark_valid_only
) {
69 active_cache
[pos
]->ce_flags
|= htons(CE_VALID
);
72 active_cache
[pos
]->ce_flags
&= ~htons(CE_VALID
);
75 cache_tree_invalidate_path(active_cache_tree
, path
);
76 active_cache_changed
= 1;
82 static int add_file_to_cache(const char *path
)
84 int size
, namelen
, option
, status
;
85 struct cache_entry
*ce
;
88 status
= lstat(path
, &st
);
90 /* We probably want to do this in remove_file_from_cache() and
91 * add_cache_entry() instead...
93 cache_tree_invalidate_path(active_cache_tree
, path
);
95 if (status
< 0 || S_ISDIR(st
.st_mode
)) {
96 /* When we used to have "path" and now we want to add
97 * "path/file", we need a way to remove "path" before
98 * being able to add "path/file". However,
99 * "git-update-index --remove path" would not work.
100 * --force-remove can be used but this is more user
101 * friendly, especially since we can do the opposite
102 * case just fine without --force-remove.
104 if (status
== 0 || (errno
== ENOENT
|| errno
== ENOTDIR
)) {
106 if (remove_file_from_cache(path
))
107 return error("%s: cannot remove from the index",
111 } else if (status
< 0) {
112 return error("%s: does not exist and --remove not passed",
117 return error("%s: is a directory - add files inside instead",
120 return error("lstat(\"%s\"): %s", path
,
124 namelen
= strlen(path
);
125 size
= cache_entry_size(namelen
);
126 ce
= xcalloc(1, size
);
127 memcpy(ce
->name
, path
, namelen
);
128 ce
->ce_flags
= htons(namelen
);
129 fill_stat_cache_info(ce
, &st
);
131 ce
->ce_mode
= create_ce_mode(st
.st_mode
);
132 if (!trust_executable_bit
) {
133 /* If there is an existing entry, pick the mode bits
136 int pos
= cache_name_pos(path
, namelen
);
138 ce
->ce_mode
= active_cache
[pos
]->ce_mode
;
141 if (index_path(ce
->sha1
, path
, &st
, !info_only
))
143 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
144 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
145 if (add_cache_entry(ce
, option
))
146 return error("%s: cannot add to the index - missing --add option?",
152 * "refresh" does not calculate a new sha1 file or bring the
153 * cache up-to-date for mode/content changes. But what it
154 * _does_ do is to "re-match" the stat information of a file
155 * with the cache, so that you can refresh the cache for a
156 * file that hasn't been changed but where the stat entry is
159 * For example, you'd want to do this after doing a "git-read-tree",
160 * to link up the stat cache details with the proper files.
162 static struct cache_entry
*refresh_entry(struct cache_entry
*ce
, int really
)
165 struct cache_entry
*updated
;
168 if (lstat(ce
->name
, &st
) < 0)
169 return ERR_PTR(-errno
);
171 changed
= ce_match_stat(ce
, &st
, really
);
173 if (really
&& assume_unchanged
&&
174 !(ce
->ce_flags
& htons(CE_VALID
)))
175 ; /* mark this one VALID again */
180 if (ce_modified(ce
, &st
, really
))
181 return ERR_PTR(-EINVAL
);
184 updated
= xmalloc(size
);
185 memcpy(updated
, ce
, size
);
186 fill_stat_cache_info(updated
, &st
);
188 /* In this case, if really is not set, we should leave
189 * CE_VALID bit alone. Otherwise, paths marked with
190 * --no-assume-unchanged (i.e. things to be edited) will
191 * reacquire CE_VALID bit automatically, which is not
192 * really what we want.
194 if (!really
&& assume_unchanged
&& !(ce
->ce_flags
& htons(CE_VALID
)))
195 updated
->ce_flags
&= ~htons(CE_VALID
);
200 static int refresh_cache(int really
)
205 for (i
= 0; i
< active_nr
; i
++) {
206 struct cache_entry
*ce
, *new;
207 ce
= active_cache
[i
];
209 while ((i
< active_nr
) &&
210 ! strcmp(active_cache
[i
]->name
, ce
->name
))
215 printf("%s: needs merge\n", ce
->name
);
220 new = refresh_entry(ce
, really
);
224 if (not_new
&& PTR_ERR(new) == -ENOENT
)
226 if (really
&& PTR_ERR(new) == -EINVAL
) {
227 /* If we are doing --really-refresh that
228 * means the index is not valid anymore.
230 ce
->ce_flags
&= ~htons(CE_VALID
);
231 active_cache_changed
= 1;
235 printf("%s: needs update\n", ce
->name
);
239 active_cache_changed
= 1;
240 /* You can NOT just free active_cache[i] here, since it
241 * might not be necessarily malloc()ed but can also come
243 active_cache
[i
] = new;
249 * We fundamentally don't like some paths: we don't want
250 * dot or dot-dot anywhere, and for obvious reasons don't
251 * want to recurse into ".git" either.
253 * Also, we don't want double slashes or slashes at the
254 * end that can make pathnames ambiguous.
256 static int verify_dotfile(const char *rest
)
259 * The first character was '.', but that
260 * has already been discarded, we now test
264 /* "." is not allowed */
269 * ".git" followed by NUL or slash is bad. This
270 * shares the path end test with the ".." case.
280 if (rest
[1] == '\0' || rest
[1] == '/')
286 static int verify_path(const char *path
)
303 if (verify_dotfile(path
))
312 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
313 const char *path
, int stage
)
315 int size
, len
, option
;
316 struct cache_entry
*ce
;
318 if (!verify_path(path
))
322 size
= cache_entry_size(len
);
323 ce
= xcalloc(1, size
);
325 memcpy(ce
->sha1
, sha1
, 20);
326 memcpy(ce
->name
, path
, len
);
327 ce
->ce_flags
= create_ce_flags(len
, stage
);
328 ce
->ce_mode
= create_ce_mode(mode
);
329 if (assume_unchanged
)
330 ce
->ce_flags
|= htons(CE_VALID
);
331 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
332 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
333 if (add_cache_entry(ce
, option
))
334 return error("%s: cannot add to the index - missing --add option?",
336 report("add '%s'", path
);
337 cache_tree_invalidate_path(active_cache_tree
, path
);
341 static void chmod_path(int flip
, const char *path
)
344 struct cache_entry
*ce
;
347 pos
= cache_name_pos(path
, strlen(path
));
350 ce
= active_cache
[pos
];
351 mode
= ntohl(ce
->ce_mode
);
356 ce
->ce_mode
|= htonl(0111); break;
358 ce
->ce_mode
&= htonl(~0111); break;
362 cache_tree_invalidate_path(active_cache_tree
, path
);
363 active_cache_changed
= 1;
364 report("chmod %cx '%s'", flip
, path
);
367 die("git-update-index: cannot chmod %cx '%s'", flip
, path
);
370 static struct cache_file cache_file
;
372 static void update_one(const char *path
, const char *prefix
, int prefix_length
)
374 const char *p
= prefix_path(prefix
, prefix_length
, path
);
375 if (!verify_path(p
)) {
376 fprintf(stderr
, "Ignoring path %s\n", path
);
379 if (mark_valid_only
) {
381 die("Unable to mark file %s", path
);
384 cache_tree_invalidate_path(active_cache_tree
, path
);
387 if (remove_file_from_cache(p
))
388 die("git-update-index: unable to remove %s", path
);
389 report("remove '%s'", path
);
392 if (add_file_to_cache(p
))
393 die("Unable to process file %s", path
);
394 report("add '%s'", path
);
396 if (p
< path
|| p
> path
+ strlen(path
))
400 static void read_index_info(int line_termination
)
407 unsigned char sha1
[20];
411 /* This reads lines formatted in one of three formats:
413 * (1) mode SP sha1 TAB path
414 * The first format is what "git-apply --index-info"
415 * reports, and used to reconstruct a partial tree
416 * that is used for phony merge base tree when falling
417 * back on 3-way merge.
419 * (2) mode SP type SP sha1 TAB path
420 * The second format is to stuff git-ls-tree output
421 * into the index file.
423 * (3) mode SP sha1 SP stage TAB path
424 * This format is to put higher order stages into the
425 * index file and matches git-ls-files --stage output.
427 read_line(&buf
, stdin
, line_termination
);
431 mode
= strtoul(buf
.buf
, &ptr
, 8);
432 if (ptr
== buf
.buf
|| *ptr
!= ' ')
435 tab
= strchr(ptr
, '\t');
436 if (!tab
|| tab
- ptr
< 41)
439 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
440 stage
= tab
[-1] - '0';
441 ptr
= tab
+ 1; /* point at the head of path */
442 tab
= tab
- 2; /* point at tail of sha1 */
446 ptr
= tab
+ 1; /* point at the head of path */
449 if (get_sha1_hex(tab
- 40, sha1
) || tab
[-41] != ' ')
452 if (line_termination
&& ptr
[0] == '"')
453 path_name
= unquote_c_style(ptr
, NULL
);
457 if (!verify_path(path_name
)) {
458 fprintf(stderr
, "Ignoring path %s\n", path_name
);
459 if (path_name
!= ptr
)
463 cache_tree_invalidate_path(active_cache_tree
, path_name
);
466 /* mode == 0 means there is no such path -- remove */
467 if (remove_file_from_cache(path_name
))
468 die("git-update-index: unable to remove %s",
472 /* mode ' ' sha1 '\t' name
473 * ptr[-1] points at tab,
474 * ptr[-41] is at the beginning of sha1
476 ptr
[-42] = ptr
[-1] = 0;
477 if (add_cacheinfo(mode
, sha1
, path_name
, stage
))
478 die("git-update-index: unable to update %s",
481 if (path_name
!= ptr
)
486 die("malformed index info %s", buf
.buf
);
490 static const char update_index_usage
[] =
491 "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>...";
493 static unsigned char head_sha1
[20];
494 static unsigned char merge_head_sha1
[20];
496 static struct cache_entry
*read_one_ent(const char *which
,
497 unsigned char *ent
, const char *path
,
498 int namelen
, int stage
)
501 unsigned char sha1
[20];
503 struct cache_entry
*ce
;
505 if (get_tree_entry(ent
, path
, sha1
, &mode
)) {
507 error("%s: not in %s branch.", path
, which
);
510 if (mode
== S_IFDIR
) {
512 error("%s: not a blob in %s branch.", path
, which
);
515 size
= cache_entry_size(namelen
);
516 ce
= xcalloc(1, size
);
518 memcpy(ce
->sha1
, sha1
, 20);
519 memcpy(ce
->name
, path
, namelen
);
520 ce
->ce_flags
= create_ce_flags(namelen
, stage
);
521 ce
->ce_mode
= create_ce_mode(mode
);
525 static int unresolve_one(const char *path
)
527 int namelen
= strlen(path
);
530 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
532 /* See if there is such entry in the index. */
533 pos
= cache_name_pos(path
, namelen
);
535 /* If there isn't, either it is unmerged, or
536 * resolved as "removed" by mistake. We do not
537 * want to do anything in the former case.
540 if (pos
< active_nr
) {
541 struct cache_entry
*ce
= active_cache
[pos
];
542 if (ce_namelen(ce
) == namelen
&&
543 !memcmp(ce
->name
, path
, namelen
)) {
545 "%s: skipping still unmerged path.\n",
552 /* Grab blobs from given path from HEAD and MERGE_HEAD,
553 * stuff HEAD version in stage #2,
554 * stuff MERGE_HEAD version in stage #3.
556 ce_2
= read_one_ent("our", head_sha1
, path
, namelen
, 2);
557 ce_3
= read_one_ent("their", merge_head_sha1
, path
, namelen
, 3);
559 if (!ce_2
|| !ce_3
) {
563 if (!memcmp(ce_2
->sha1
, ce_3
->sha1
, 20) &&
564 ce_2
->ce_mode
== ce_3
->ce_mode
) {
565 fprintf(stderr
, "%s: identical in both, skipping.\n",
570 cache_tree_invalidate_path(active_cache_tree
, path
);
571 remove_file_from_cache(path
);
572 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
573 error("%s: cannot add our version to the index.", path
);
577 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
579 error("%s: cannot add their version to the index.", path
);
587 static void read_head_pointers(void)
589 if (read_ref(git_path("HEAD"), head_sha1
))
590 die("No HEAD -- no initial commit yet?\n");
591 if (read_ref(git_path("MERGE_HEAD"), merge_head_sha1
)) {
592 fprintf(stderr
, "Not in the middle of a merge.\n");
597 static int do_unresolve(int ac
, const char **av
,
598 const char *prefix
, int prefix_length
)
603 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
604 * are not doing a merge, so exit with success status.
606 read_head_pointers();
608 for (i
= 1; i
< ac
; i
++) {
609 const char *arg
= av
[i
];
610 const char *p
= prefix_path(prefix
, prefix_length
, arg
);
611 err
|= unresolve_one(p
);
612 if (p
< arg
|| p
> arg
+ strlen(arg
))
618 static int do_reupdate(int ac
, const char **av
,
619 const char *prefix
, int prefix_length
)
621 /* Read HEAD and run update-index on paths that are
622 * merged and already different between index and HEAD.
626 const char **pathspec
= get_pathspec(prefix
, av
+ 1);
628 if (read_ref(git_path("HEAD"), head_sha1
))
629 /* If there is no HEAD, that means it is an initial
630 * commit. Update everything in the index.
634 for (pos
= 0; pos
< active_nr
; pos
++) {
635 struct cache_entry
*ce
= active_cache
[pos
];
636 struct cache_entry
*old
= NULL
;
639 if (ce_stage(ce
) || !ce_path_match(ce
, pathspec
))
642 old
= read_one_ent(NULL
, head_sha1
,
643 ce
->name
, ce_namelen(ce
), 0);
644 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
645 !memcmp(ce
->sha1
, old
->sha1
, 20)) {
647 continue; /* unchanged */
649 /* Be careful. The working tree may not have the
650 * path anymore, in which case, under 'allow_remove',
651 * or worse yet 'allow_replace', active_nr may decrease.
654 update_one(ce
->name
+ prefix_length
, prefix
, prefix_length
);
655 if (save_nr
!= active_nr
)
661 int main(int argc
, const char **argv
)
663 int i
, newfd
, entries
, has_errors
= 0, line_termination
= '\n';
664 int allow_options
= 1;
665 int read_from_stdin
= 0;
666 const char *prefix
= setup_git_directory();
667 int prefix_length
= prefix
? strlen(prefix
) : 0;
668 char set_executable_bit
= 0;
670 git_config(git_default_config
);
672 newfd
= hold_index_file_for_update(&cache_file
, get_index_file());
674 die("unable to create new cachefile");
676 entries
= read_cache();
678 die("cache corrupted");
680 for (i
= 1 ; i
< argc
; i
++) {
681 const char *path
= argv
[i
];
683 if (allow_options
&& *path
== '-') {
684 if (!strcmp(path
, "--")) {
688 if (!strcmp(path
, "-q")) {
692 if (!strcmp(path
, "--add")) {
696 if (!strcmp(path
, "--replace")) {
700 if (!strcmp(path
, "--remove")) {
704 if (!strcmp(path
, "--unmerged")) {
708 if (!strcmp(path
, "--refresh")) {
709 has_errors
|= refresh_cache(0);
712 if (!strcmp(path
, "--really-refresh")) {
713 has_errors
|= refresh_cache(1);
716 if (!strcmp(path
, "--cacheinfo")) {
717 unsigned char sha1
[20];
721 die("git-update-index: --cacheinfo <mode> <sha1> <path>");
723 if ((sscanf(argv
[i
+1], "%o", &mode
) != 1) ||
724 get_sha1_hex(argv
[i
+2], sha1
) ||
725 add_cacheinfo(mode
, sha1
, argv
[i
+3], 0))
726 die("git-update-index: --cacheinfo"
727 " cannot add %s", argv
[i
+3]);
731 if (!strcmp(path
, "--chmod=-x") ||
732 !strcmp(path
, "--chmod=+x")) {
734 die("git-update-index: %s <path>", path
);
735 set_executable_bit
= path
[8];
738 if (!strcmp(path
, "--assume-unchanged")) {
739 mark_valid_only
= MARK_VALID
;
742 if (!strcmp(path
, "--no-assume-unchanged")) {
743 mark_valid_only
= UNMARK_VALID
;
746 if (!strcmp(path
, "--info-only")) {
750 if (!strcmp(path
, "--force-remove")) {
754 if (!strcmp(path
, "-z")) {
755 line_termination
= 0;
758 if (!strcmp(path
, "--stdin")) {
760 die("--stdin must be at the end");
764 if (!strcmp(path
, "--index-info")) {
766 die("--index-info must be at the end");
767 allow_add
= allow_replace
= allow_remove
= 1;
768 read_index_info(line_termination
);
771 if (!strcmp(path
, "--unresolve")) {
772 has_errors
= do_unresolve(argc
- i
, argv
+ i
,
773 prefix
, prefix_length
);
775 active_cache_changed
= 0;
778 if (!strcmp(path
, "--again")) {
779 has_errors
= do_reupdate(argc
- i
, argv
+ i
,
780 prefix
, prefix_length
);
782 active_cache_changed
= 0;
785 if (!strcmp(path
, "--ignore-missing")) {
789 if (!strcmp(path
, "--verbose")) {
793 if (!strcmp(path
, "-h") || !strcmp(path
, "--help"))
794 usage(update_index_usage
);
795 die("unknown option %s", path
);
797 update_one(path
, prefix
, prefix_length
);
798 if (set_executable_bit
)
799 chmod_path(set_executable_bit
, path
);
801 if (read_from_stdin
) {
807 read_line(&buf
, stdin
, line_termination
);
810 if (line_termination
&& buf
.buf
[0] == '"')
811 path_name
= unquote_c_style(buf
.buf
, NULL
);
814 p
= prefix_path(prefix
, prefix_length
, path_name
);
815 update_one(p
, NULL
, 0);
816 if (set_executable_bit
)
817 chmod_path(set_executable_bit
, p
);
818 if (p
< path_name
|| p
> path_name
+ strlen(path_name
))
820 if (path_name
!= buf
.buf
)
826 if (active_cache_changed
) {
827 if (write_cache(newfd
, active_cache
, active_nr
) ||
828 commit_index_file(&cache_file
))
829 die("Unable to write new cachefile");
832 return has_errors
? 1 : 0;