2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
12 * Default to not allowing changes to the list of files. The
13 * tool doesn't actually care, but this makes it harder to add
14 * files to the revision control by mistake by doing something
15 * like "git-update-index *" and suddenly having all the object
16 * files be revision controlled.
19 static int allow_remove
;
20 static int allow_replace
;
21 static int allow_unmerged
; /* --refresh needing merge is not error */
22 static int not_new
; /* --refresh not having working tree files is not error */
23 static int quiet
; /* --refresh needing update is not error */
25 static int force_remove
;
27 static int mark_valid_only
= 0;
29 #define UNMARK_VALID 2
32 /* Three functions to allow overloaded pointer return; see linux/err.h */
33 static inline void *ERR_PTR(long error
)
35 return (void *) error
;
38 static inline long PTR_ERR(const void *ptr
)
43 static inline long IS_ERR(const void *ptr
)
45 return (unsigned long)ptr
> (unsigned long)-1000L;
48 static void report(const char *fmt
, ...)
61 static int mark_valid(const char *path
)
63 int namelen
= strlen(path
);
64 int pos
= cache_name_pos(path
, namelen
);
66 switch (mark_valid_only
) {
68 active_cache
[pos
]->ce_flags
|= htons(CE_VALID
);
71 active_cache
[pos
]->ce_flags
&= ~htons(CE_VALID
);
74 active_cache_changed
= 1;
80 static int add_file_to_cache(const char *path
)
82 int size
, namelen
, option
, status
;
83 struct cache_entry
*ce
;
86 status
= lstat(path
, &st
);
87 if (status
< 0 || S_ISDIR(st
.st_mode
)) {
88 /* When we used to have "path" and now we want to add
89 * "path/file", we need a way to remove "path" before
90 * being able to add "path/file". However,
91 * "git-update-index --remove path" would not work.
92 * --force-remove can be used but this is more user
93 * friendly, especially since we can do the opposite
94 * case just fine without --force-remove.
96 if (status
== 0 || (errno
== ENOENT
|| errno
== ENOTDIR
)) {
98 if (remove_file_from_cache(path
))
99 return error("%s: cannot remove from the index",
103 } else if (status
< 0) {
104 return error("%s: does not exist and --remove not passed",
109 return error("%s: is a directory - add files inside instead",
112 return error("lstat(\"%s\"): %s", path
,
116 namelen
= strlen(path
);
117 size
= cache_entry_size(namelen
);
118 ce
= xcalloc(1, size
);
119 memcpy(ce
->name
, path
, namelen
);
120 ce
->ce_flags
= htons(namelen
);
121 fill_stat_cache_info(ce
, &st
);
123 ce
->ce_mode
= create_ce_mode(st
.st_mode
);
124 if (!trust_executable_bit
) {
125 /* If there is an existing entry, pick the mode bits
128 int pos
= cache_name_pos(path
, namelen
);
130 ce
->ce_mode
= active_cache
[pos
]->ce_mode
;
133 if (index_path(ce
->sha1
, path
, &st
, !info_only
))
135 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
136 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
137 if (add_cache_entry(ce
, option
))
138 return error("%s: cannot add to the index - missing --add option?",
144 * "refresh" does not calculate a new sha1 file or bring the
145 * cache up-to-date for mode/content changes. But what it
146 * _does_ do is to "re-match" the stat information of a file
147 * with the cache, so that you can refresh the cache for a
148 * file that hasn't been changed but where the stat entry is
151 * For example, you'd want to do this after doing a "git-read-tree",
152 * to link up the stat cache details with the proper files.
154 static struct cache_entry
*refresh_entry(struct cache_entry
*ce
, int really
)
157 struct cache_entry
*updated
;
160 if (lstat(ce
->name
, &st
) < 0)
161 return ERR_PTR(-errno
);
163 changed
= ce_match_stat(ce
, &st
, really
);
165 if (really
&& assume_unchanged
&&
166 !(ce
->ce_flags
& htons(CE_VALID
)))
167 ; /* mark this one VALID again */
172 if (ce_modified(ce
, &st
, really
))
173 return ERR_PTR(-EINVAL
);
176 updated
= xmalloc(size
);
177 memcpy(updated
, ce
, size
);
178 fill_stat_cache_info(updated
, &st
);
180 /* In this case, if really is not set, we should leave
181 * CE_VALID bit alone. Otherwise, paths marked with
182 * --no-assume-unchanged (i.e. things to be edited) will
183 * reacquire CE_VALID bit automatically, which is not
184 * really what we want.
186 if (!really
&& assume_unchanged
&& !(ce
->ce_flags
& htons(CE_VALID
)))
187 updated
->ce_flags
&= ~htons(CE_VALID
);
192 static int refresh_cache(int really
)
197 for (i
= 0; i
< active_nr
; i
++) {
198 struct cache_entry
*ce
, *new;
199 ce
= active_cache
[i
];
201 while ((i
< active_nr
) &&
202 ! strcmp(active_cache
[i
]->name
, ce
->name
))
207 printf("%s: needs merge\n", ce
->name
);
212 new = refresh_entry(ce
, really
);
216 if (not_new
&& PTR_ERR(new) == -ENOENT
)
218 if (really
&& PTR_ERR(new) == -EINVAL
) {
219 /* If we are doing --really-refresh that
220 * means the index is not valid anymore.
222 ce
->ce_flags
&= ~htons(CE_VALID
);
223 active_cache_changed
= 1;
227 printf("%s: needs update\n", ce
->name
);
231 active_cache_changed
= 1;
232 /* You can NOT just free active_cache[i] here, since it
233 * might not be necessarily malloc()ed but can also come
235 active_cache
[i
] = new;
241 * We fundamentally don't like some paths: we don't want
242 * dot or dot-dot anywhere, and for obvious reasons don't
243 * want to recurse into ".git" either.
245 * Also, we don't want double slashes or slashes at the
246 * end that can make pathnames ambiguous.
248 static int verify_dotfile(const char *rest
)
251 * The first character was '.', but that
252 * has already been discarded, we now test
256 /* "." is not allowed */
261 * ".git" followed by NUL or slash is bad. This
262 * shares the path end test with the ".." case.
272 if (rest
[1] == '\0' || rest
[1] == '/')
278 static int verify_path(const char *path
)
295 if (verify_dotfile(path
))
304 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
305 const char *path
, int stage
)
307 int size
, len
, option
;
308 struct cache_entry
*ce
;
310 if (!verify_path(path
))
314 size
= cache_entry_size(len
);
315 ce
= xcalloc(1, size
);
317 memcpy(ce
->sha1
, sha1
, 20);
318 memcpy(ce
->name
, path
, len
);
319 ce
->ce_flags
= create_ce_flags(len
, stage
);
320 ce
->ce_mode
= create_ce_mode(mode
);
321 if (assume_unchanged
)
322 ce
->ce_flags
|= htons(CE_VALID
);
323 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
324 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
325 if (add_cache_entry(ce
, option
))
326 return error("%s: cannot add to the index - missing --add option?",
328 report("add '%s'", path
);
332 static void chmod_path(int flip
, const char *path
)
335 struct cache_entry
*ce
;
338 pos
= cache_name_pos(path
, strlen(path
));
341 ce
= active_cache
[pos
];
342 mode
= ntohl(ce
->ce_mode
);
347 ce
->ce_mode
|= htonl(0111); break;
349 ce
->ce_mode
&= htonl(~0111); break;
353 active_cache_changed
= 1;
354 report("chmod %cx '%s'", flip
, path
);
357 die("git-update-index: cannot chmod %cx '%s'", flip
, path
);
360 static struct cache_file cache_file
;
362 static void update_one(const char *path
, const char *prefix
, int prefix_length
)
364 const char *p
= prefix_path(prefix
, prefix_length
, path
);
365 if (!verify_path(p
)) {
366 fprintf(stderr
, "Ignoring path %s\n", path
);
369 if (mark_valid_only
) {
371 die("Unable to mark file %s", path
);
376 if (remove_file_from_cache(p
))
377 die("git-update-index: unable to remove %s", path
);
378 report("remove '%s'", path
);
381 if (add_file_to_cache(p
))
382 die("Unable to process file %s", path
);
383 report("add '%s'", path
);
385 if (p
< path
|| p
> path
+ strlen(path
))
389 static void read_index_info(int line_termination
)
396 unsigned char sha1
[20];
400 /* This reads lines formatted in one of three formats:
402 * (1) mode SP sha1 TAB path
403 * The first format is what "git-apply --index-info"
404 * reports, and used to reconstruct a partial tree
405 * that is used for phony merge base tree when falling
406 * back on 3-way merge.
408 * (2) mode SP type SP sha1 TAB path
409 * The second format is to stuff git-ls-tree output
410 * into the index file.
412 * (3) mode SP sha1 SP stage TAB path
413 * This format is to put higher order stages into the
414 * index file and matches git-ls-files --stage output.
416 read_line(&buf
, stdin
, line_termination
);
420 mode
= strtoul(buf
.buf
, &ptr
, 8);
421 if (ptr
== buf
.buf
|| *ptr
!= ' ')
424 tab
= strchr(ptr
, '\t');
425 if (!tab
|| tab
- ptr
< 41)
428 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
429 stage
= tab
[-1] - '0';
430 ptr
= tab
+ 1; /* point at the head of path */
431 tab
= tab
- 2; /* point at tail of sha1 */
435 ptr
= tab
+ 1; /* point at the head of path */
438 if (get_sha1_hex(tab
- 40, sha1
) || tab
[-41] != ' ')
441 if (line_termination
&& ptr
[0] == '"')
442 path_name
= unquote_c_style(ptr
, NULL
);
446 if (!verify_path(path_name
)) {
447 fprintf(stderr
, "Ignoring path %s\n", path_name
);
448 if (path_name
!= ptr
)
454 /* mode == 0 means there is no such path -- remove */
455 if (remove_file_from_cache(path_name
))
456 die("git-update-index: unable to remove %s",
460 /* mode ' ' sha1 '\t' name
461 * ptr[-1] points at tab,
462 * ptr[-41] is at the beginning of sha1
464 ptr
[-42] = ptr
[-1] = 0;
465 if (add_cacheinfo(mode
, sha1
, path_name
, stage
))
466 die("git-update-index: unable to update %s",
469 if (path_name
!= ptr
)
474 die("malformed index info %s", buf
.buf
);
478 static const char update_index_usage
[] =
479 "git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--ignore-missing] [-z] [--verbose] [--] <file>...";
481 static unsigned char head_sha1
[20];
482 static unsigned char merge_head_sha1
[20];
484 static struct cache_entry
*read_one_ent(const char *which
,
485 unsigned char *ent
, const char *path
,
486 int namelen
, int stage
)
489 unsigned char sha1
[20];
491 struct cache_entry
*ce
;
493 if (get_tree_entry(ent
, path
, sha1
, &mode
)) {
494 error("%s: not in %s branch.", path
, which
);
497 if (mode
== S_IFDIR
) {
498 error("%s: not a blob in %s branch.", path
, which
);
501 size
= cache_entry_size(namelen
);
502 ce
= xcalloc(1, size
);
504 memcpy(ce
->sha1
, sha1
, 20);
505 memcpy(ce
->name
, path
, namelen
);
506 ce
->ce_flags
= create_ce_flags(namelen
, stage
);
507 ce
->ce_mode
= create_ce_mode(mode
);
511 static int unresolve_one(const char *path
)
513 int namelen
= strlen(path
);
516 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
518 /* See if there is such entry in the index. */
519 pos
= cache_name_pos(path
, namelen
);
521 /* If there isn't, either it is unmerged, or
522 * resolved as "removed" by mistake. We do not
523 * want to do anything in the former case.
526 if (pos
< active_nr
) {
527 struct cache_entry
*ce
= active_cache
[pos
];
528 if (ce_namelen(ce
) == namelen
&&
529 !memcmp(ce
->name
, path
, namelen
)) {
531 "%s: skipping still unmerged path.\n",
538 /* Grab blobs from given path from HEAD and MERGE_HEAD,
539 * stuff HEAD version in stage #2,
540 * stuff MERGE_HEAD version in stage #3.
542 ce_2
= read_one_ent("our", head_sha1
, path
, namelen
, 2);
543 ce_3
= read_one_ent("their", merge_head_sha1
, path
, namelen
, 3);
545 if (!ce_2
|| !ce_3
) {
549 if (!memcmp(ce_2
->sha1
, ce_3
->sha1
, 20) &&
550 ce_2
->ce_mode
== ce_3
->ce_mode
) {
551 fprintf(stderr
, "%s: identical in both, skipping.\n",
556 remove_file_from_cache(path
);
557 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
558 error("%s: cannot add our version to the index.", path
);
562 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
564 error("%s: cannot add their version to the index.", path
);
572 static void read_head_pointers(void)
574 if (read_ref(git_path("HEAD"), head_sha1
))
575 die("No HEAD -- no initial commit yet?\n");
576 if (read_ref(git_path("MERGE_HEAD"), merge_head_sha1
)) {
577 fprintf(stderr
, "Not in the middle of a merge.\n");
582 static int do_unresolve(int ac
, const char **av
,
583 const char *prefix
, int prefix_length
)
588 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
589 * are not doing a merge, so exit with success status.
591 read_head_pointers();
593 for (i
= 1; i
< ac
; i
++) {
594 const char *arg
= av
[i
];
595 const char *p
= prefix_path(prefix
, prefix_length
, arg
);
596 err
|= unresolve_one(p
);
597 if (p
< arg
|| p
> arg
+ strlen(arg
))
603 int main(int argc
, const char **argv
)
605 int i
, newfd
, entries
, has_errors
= 0, line_termination
= '\n';
606 int allow_options
= 1;
607 int read_from_stdin
= 0;
608 const char *prefix
= setup_git_directory();
609 int prefix_length
= prefix
? strlen(prefix
) : 0;
610 char set_executable_bit
= 0;
612 git_config(git_default_config
);
614 newfd
= hold_index_file_for_update(&cache_file
, get_index_file());
616 die("unable to create new cachefile");
618 entries
= read_cache();
620 die("cache corrupted");
622 for (i
= 1 ; i
< argc
; i
++) {
623 const char *path
= argv
[i
];
625 if (allow_options
&& *path
== '-') {
626 if (!strcmp(path
, "--")) {
630 if (!strcmp(path
, "-q")) {
634 if (!strcmp(path
, "--add")) {
638 if (!strcmp(path
, "--replace")) {
642 if (!strcmp(path
, "--remove")) {
646 if (!strcmp(path
, "--unmerged")) {
650 if (!strcmp(path
, "--refresh")) {
651 has_errors
|= refresh_cache(0);
654 if (!strcmp(path
, "--really-refresh")) {
655 has_errors
|= refresh_cache(1);
658 if (!strcmp(path
, "--cacheinfo")) {
659 unsigned char sha1
[20];
663 die("git-update-index: --cacheinfo <mode> <sha1> <path>");
665 if ((sscanf(argv
[i
+1], "%o", &mode
) != 1) ||
666 get_sha1_hex(argv
[i
+2], sha1
) ||
667 add_cacheinfo(mode
, sha1
, argv
[i
+3], 0))
668 die("git-update-index: --cacheinfo"
669 " cannot add %s", argv
[i
+3]);
673 if (!strcmp(path
, "--chmod=-x") ||
674 !strcmp(path
, "--chmod=+x")) {
676 die("git-update-index: %s <path>", path
);
677 set_executable_bit
= path
[8];
680 if (!strcmp(path
, "--assume-unchanged")) {
681 mark_valid_only
= MARK_VALID
;
684 if (!strcmp(path
, "--no-assume-unchanged")) {
685 mark_valid_only
= UNMARK_VALID
;
688 if (!strcmp(path
, "--info-only")) {
692 if (!strcmp(path
, "--force-remove")) {
696 if (!strcmp(path
, "-z")) {
697 line_termination
= 0;
700 if (!strcmp(path
, "--stdin")) {
702 die("--stdin must be at the end");
706 if (!strcmp(path
, "--index-info")) {
708 die("--index-info must be at the end");
709 allow_add
= allow_replace
= allow_remove
= 1;
710 read_index_info(line_termination
);
713 if (!strcmp(path
, "--unresolve")) {
714 has_errors
= do_unresolve(argc
- i
, argv
+ i
,
715 prefix
, prefix_length
);
717 active_cache_changed
= 0;
720 if (!strcmp(path
, "--ignore-missing")) {
724 if (!strcmp(path
, "--verbose")) {
728 if (!strcmp(path
, "-h") || !strcmp(path
, "--help"))
729 usage(update_index_usage
);
730 die("unknown option %s", path
);
732 update_one(path
, prefix
, prefix_length
);
733 if (set_executable_bit
)
734 chmod_path(set_executable_bit
, path
);
736 if (read_from_stdin
) {
742 read_line(&buf
, stdin
, line_termination
);
745 if (line_termination
&& buf
.buf
[0] == '"')
746 path_name
= unquote_c_style(buf
.buf
, NULL
);
749 p
= prefix_path(prefix
, prefix_length
, path_name
);
750 update_one(p
, NULL
, 0);
751 if (set_executable_bit
)
752 chmod_path(set_executable_bit
, p
);
753 if (p
< path_name
|| p
> path_name
+ strlen(path_name
))
755 if (path_name
!= buf
.buf
)
761 if (active_cache_changed
) {
762 if (write_cache(newfd
, active_cache
, active_nr
) ||
763 commit_index_file(&cache_file
))
764 die("Unable to write new cachefile");
767 return has_errors
? 1 : 0;