2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
8 #include "cache-tree.h"
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.
21 static int allow_remove
;
22 static int allow_replace
;
24 static int force_remove
;
26 static int mark_valid_only
;
27 static int mark_skip_worktree_only
;
31 static void report(const char *fmt
, ...)
44 static int mark_ce_flags(const char *path
, int flag
, int mark
)
46 int namelen
= strlen(path
);
47 int pos
= cache_name_pos(path
, namelen
);
50 active_cache
[pos
]->ce_flags
|= flag
;
52 active_cache
[pos
]->ce_flags
&= ~flag
;
53 cache_tree_invalidate_path(active_cache_tree
, path
);
54 active_cache_changed
= 1;
60 static int remove_one_path(const char *path
)
63 return error("%s: does not exist and --remove not passed", path
);
64 if (remove_file_from_cache(path
))
65 return error("%s: cannot remove from the index", path
);
70 * Handle a path that couldn't be lstat'ed. It's either:
71 * - missing file (ENOENT or ENOTDIR). That's ok if we're
72 * supposed to be removing it and the removal actually
74 * - permission error. That's never ok.
76 static int process_lstat_error(const char *path
, int err
)
78 if (err
== ENOENT
|| err
== ENOTDIR
)
79 return remove_one_path(path
);
80 return error("lstat(\"%s\"): %s", path
, strerror(errno
));
83 static int add_one_path(struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
86 struct cache_entry
*ce
;
88 /* Was the old index entry already up-to-date? */
89 if (old
&& !ce_stage(old
) && !ce_match_stat(old
, st
, 0))
92 size
= cache_entry_size(len
);
93 ce
= xcalloc(1, size
);
94 memcpy(ce
->name
, path
, len
);
96 fill_stat_cache_info(ce
, st
);
97 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
99 if (index_path(ce
->sha1
, path
, st
, !info_only
))
101 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
102 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
103 if (add_cache_entry(ce
, option
))
104 return error("%s: cannot add to the index - missing --add option?", path
);
109 * Handle a path that was a directory. Four cases:
111 * - it's already a gitlink in the index, and we keep it that
112 * way, and update it if we can (if we cannot find the HEAD,
113 * we're going to keep it unchanged in the index!)
115 * - it's a *file* in the index, in which case it should be
116 * removed as a file if removal is allowed, since it doesn't
117 * exist as such any more. If removal isn't allowed, it's
120 * (NOTE! This is old and arguably fairly strange behaviour.
121 * We might want to make this an error unconditionally, and
122 * use "--force-remove" if you actually want to force removal).
124 * - it used to exist as a subdirectory (ie multiple files with
125 * this particular prefix) in the index, in which case it's wrong
126 * to try to update it as a directory.
128 * - it doesn't exist at all in the index, but it is a valid
129 * git directory, and it should be *added* as a gitlink.
131 static int process_directory(const char *path
, int len
, struct stat
*st
)
133 unsigned char sha1
[20];
134 int pos
= cache_name_pos(path
, len
);
136 /* Exact match: file or existing gitlink */
138 struct cache_entry
*ce
= active_cache
[pos
];
139 if (S_ISGITLINK(ce
->ce_mode
)) {
141 /* Do nothing to the index if there is no HEAD! */
142 if (resolve_gitlink_ref(path
, "HEAD", sha1
) < 0)
145 return add_one_path(ce
, path
, len
, st
);
147 /* Should this be an unconditional error? */
148 return remove_one_path(path
);
151 /* Inexact match: is there perhaps a subdirectory match? */
153 while (pos
< active_nr
) {
154 struct cache_entry
*ce
= active_cache
[pos
++];
156 if (strncmp(ce
->name
, path
, len
))
158 if (ce
->name
[len
] > '/')
160 if (ce
->name
[len
] < '/')
163 /* Subdirectory match - error out */
164 return error("%s: is a directory - add individual files instead", path
);
167 /* No match - should we add it as a gitlink? */
168 if (!resolve_gitlink_ref(path
, "HEAD", sha1
))
169 return add_one_path(NULL
, path
, len
, st
);
172 return error("%s: is a directory - add files inside instead", path
);
175 static int process_path(const char *path
)
179 struct cache_entry
*ce
;
182 if (has_symlink_leading_path(path
, len
))
183 return error("'%s' is beyond a symbolic link", path
);
185 pos
= cache_name_pos(path
, len
);
186 ce
= pos
< 0 ? NULL
: active_cache
[pos
];
187 if (ce
&& ce_skip_worktree(ce
)) {
189 * working directory version is assumed "good"
190 * so updating it does not make sense.
191 * On the other hand, removing it from index should work
193 if (allow_remove
&& remove_file_from_cache(path
))
194 return error("%s: cannot remove from the index", path
);
199 * First things first: get the stat information, to decide
200 * what to do about the pathname!
202 if (lstat(path
, &st
) < 0)
203 return process_lstat_error(path
, errno
);
205 if (S_ISDIR(st
.st_mode
))
206 return process_directory(path
, len
, &st
);
209 * Process a regular file
211 if (ce
&& S_ISGITLINK(ce
->ce_mode
))
212 return error("%s is already a gitlink, not replacing", path
);
214 return add_one_path(ce
, path
, len
, &st
);
217 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
218 const char *path
, int stage
)
220 int size
, len
, option
;
221 struct cache_entry
*ce
;
223 if (!verify_path(path
))
224 return error("Invalid path '%s'", path
);
227 size
= cache_entry_size(len
);
228 ce
= xcalloc(1, size
);
230 hashcpy(ce
->sha1
, sha1
);
231 memcpy(ce
->name
, path
, len
);
232 ce
->ce_flags
= create_ce_flags(len
, stage
);
233 ce
->ce_mode
= create_ce_mode(mode
);
234 if (assume_unchanged
)
235 ce
->ce_flags
|= CE_VALID
;
236 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
237 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
238 if (add_cache_entry(ce
, option
))
239 return error("%s: cannot add to the index - missing --add option?",
241 report("add '%s'", path
);
245 static void chmod_path(int flip
, const char *path
)
248 struct cache_entry
*ce
;
251 pos
= cache_name_pos(path
, strlen(path
));
254 ce
= active_cache
[pos
];
260 ce
->ce_mode
|= 0111; break;
262 ce
->ce_mode
&= ~0111; break;
266 cache_tree_invalidate_path(active_cache_tree
, path
);
267 active_cache_changed
= 1;
268 report("chmod %cx '%s'", flip
, path
);
271 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
274 static void update_one(const char *path
, const char *prefix
, int prefix_length
)
276 const char *p
= prefix_path(prefix
, prefix_length
, path
);
277 if (!verify_path(p
)) {
278 fprintf(stderr
, "Ignoring path %s\n", path
);
281 if (mark_valid_only
) {
282 if (mark_ce_flags(p
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
283 die("Unable to mark file %s", path
);
286 if (mark_skip_worktree_only
) {
287 if (mark_ce_flags(p
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
288 die("Unable to mark file %s", path
);
293 if (remove_file_from_cache(p
))
294 die("git update-index: unable to remove %s", path
);
295 report("remove '%s'", path
);
299 die("Unable to process path %s", path
);
300 report("add '%s'", path
);
302 if (p
< path
|| p
> path
+ strlen(path
))
306 static void read_index_info(int line_termination
)
308 struct strbuf buf
= STRBUF_INIT
;
309 struct strbuf uq
= STRBUF_INIT
;
311 while (strbuf_getline(&buf
, stdin
, line_termination
) != EOF
) {
314 unsigned char sha1
[20];
319 /* This reads lines formatted in one of three formats:
321 * (1) mode SP sha1 TAB path
322 * The first format is what "git apply --index-info"
323 * reports, and used to reconstruct a partial tree
324 * that is used for phony merge base tree when falling
325 * back on 3-way merge.
327 * (2) mode SP type SP sha1 TAB path
328 * The second format is to stuff "git ls-tree" output
329 * into the index file.
331 * (3) mode SP sha1 SP stage TAB path
332 * This format is to put higher order stages into the
333 * index file and matches "git ls-files --stage" output.
336 ul
= strtoul(buf
.buf
, &ptr
, 8);
337 if (ptr
== buf
.buf
|| *ptr
!= ' '
338 || errno
|| (unsigned int) ul
!= ul
)
342 tab
= strchr(ptr
, '\t');
343 if (!tab
|| tab
- ptr
< 41)
346 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
347 stage
= tab
[-1] - '0';
348 ptr
= tab
+ 1; /* point at the head of path */
349 tab
= tab
- 2; /* point at tail of sha1 */
353 ptr
= tab
+ 1; /* point at the head of path */
356 if (get_sha1_hex(tab
- 40, sha1
) || tab
[-41] != ' ')
360 if (line_termination
&& path_name
[0] == '"') {
362 if (unquote_c_style(&uq
, path_name
, NULL
)) {
363 die("git update-index: bad quoting of path name");
368 if (!verify_path(path_name
)) {
369 fprintf(stderr
, "Ignoring path %s\n", path_name
);
374 /* mode == 0 means there is no such path -- remove */
375 if (remove_file_from_cache(path_name
))
376 die("git update-index: unable to remove %s",
380 /* mode ' ' sha1 '\t' name
381 * ptr[-1] points at tab,
382 * ptr[-41] is at the beginning of sha1
384 ptr
[-42] = ptr
[-1] = 0;
385 if (add_cacheinfo(mode
, sha1
, path_name
, stage
))
386 die("git update-index: unable to update %s",
392 die("malformed index info %s", buf
.buf
);
394 strbuf_release(&buf
);
398 static const char update_index_usage
[] =
399 "git update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--skip-worktree|--no-skip-worktree] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] <file>...";
401 static unsigned char head_sha1
[20];
402 static unsigned char merge_head_sha1
[20];
404 static struct cache_entry
*read_one_ent(const char *which
,
405 unsigned char *ent
, const char *path
,
406 int namelen
, int stage
)
409 unsigned char sha1
[20];
411 struct cache_entry
*ce
;
413 if (get_tree_entry(ent
, path
, sha1
, &mode
)) {
415 error("%s: not in %s branch.", path
, which
);
418 if (mode
== S_IFDIR
) {
420 error("%s: not a blob in %s branch.", path
, which
);
423 size
= cache_entry_size(namelen
);
424 ce
= xcalloc(1, size
);
426 hashcpy(ce
->sha1
, sha1
);
427 memcpy(ce
->name
, path
, namelen
);
428 ce
->ce_flags
= create_ce_flags(namelen
, stage
);
429 ce
->ce_mode
= create_ce_mode(mode
);
433 static int unresolve_one(const char *path
)
435 int namelen
= strlen(path
);
438 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
440 /* See if there is such entry in the index. */
441 pos
= cache_name_pos(path
, namelen
);
443 /* If there isn't, either it is unmerged, or
444 * resolved as "removed" by mistake. We do not
445 * want to do anything in the former case.
448 if (pos
< active_nr
) {
449 struct cache_entry
*ce
= active_cache
[pos
];
450 if (ce_namelen(ce
) == namelen
&&
451 !memcmp(ce
->name
, path
, namelen
)) {
453 "%s: skipping still unmerged path.\n",
460 /* Grab blobs from given path from HEAD and MERGE_HEAD,
461 * stuff HEAD version in stage #2,
462 * stuff MERGE_HEAD version in stage #3.
464 ce_2
= read_one_ent("our", head_sha1
, path
, namelen
, 2);
465 ce_3
= read_one_ent("their", merge_head_sha1
, path
, namelen
, 3);
467 if (!ce_2
|| !ce_3
) {
471 if (!hashcmp(ce_2
->sha1
, ce_3
->sha1
) &&
472 ce_2
->ce_mode
== ce_3
->ce_mode
) {
473 fprintf(stderr
, "%s: identical in both, skipping.\n",
478 remove_file_from_cache(path
);
479 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
480 error("%s: cannot add our version to the index.", path
);
484 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
486 error("%s: cannot add their version to the index.", path
);
494 static void read_head_pointers(void)
496 if (read_ref("HEAD", head_sha1
))
497 die("No HEAD -- no initial commit yet?");
498 if (read_ref("MERGE_HEAD", merge_head_sha1
)) {
499 fprintf(stderr
, "Not in the middle of a merge.\n");
504 static int do_unresolve(int ac
, const char **av
,
505 const char *prefix
, int prefix_length
)
510 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
511 * are not doing a merge, so exit with success status.
513 read_head_pointers();
515 for (i
= 1; i
< ac
; i
++) {
516 const char *arg
= av
[i
];
517 const char *p
= prefix_path(prefix
, prefix_length
, arg
);
518 err
|= unresolve_one(p
);
519 if (p
< arg
|| p
> arg
+ strlen(arg
))
525 static int do_reupdate(int ac
, const char **av
,
526 const char *prefix
, int prefix_length
)
528 /* Read HEAD and run update-index on paths that are
529 * merged and already different between index and HEAD.
533 const char **pathspec
= get_pathspec(prefix
, av
+ 1);
535 if (read_ref("HEAD", head_sha1
))
536 /* If there is no HEAD, that means it is an initial
537 * commit. Update everything in the index.
541 for (pos
= 0; pos
< active_nr
; pos
++) {
542 struct cache_entry
*ce
= active_cache
[pos
];
543 struct cache_entry
*old
= NULL
;
546 if (ce_stage(ce
) || !ce_path_match(ce
, pathspec
))
549 old
= read_one_ent(NULL
, head_sha1
,
550 ce
->name
, ce_namelen(ce
), 0);
551 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
552 !hashcmp(ce
->sha1
, old
->sha1
)) {
554 continue; /* unchanged */
556 /* Be careful. The working tree may not have the
557 * path anymore, in which case, under 'allow_remove',
558 * or worse yet 'allow_replace', active_nr may decrease.
561 update_one(ce
->name
+ prefix_length
, prefix
, prefix_length
);
562 if (save_nr
!= active_nr
)
568 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
570 int i
, newfd
, entries
, has_errors
= 0, line_termination
= '\n';
571 int allow_options
= 1;
572 int read_from_stdin
= 0;
573 int prefix_length
= prefix
? strlen(prefix
) : 0;
574 char set_executable_bit
= 0;
575 unsigned int refresh_flags
= 0;
577 struct lock_file
*lock_file
;
579 git_config(git_default_config
, NULL
);
581 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
582 lock_file
= xcalloc(1, sizeof(struct lock_file
));
584 newfd
= hold_locked_index(lock_file
, 0);
588 entries
= read_cache();
590 die("cache corrupted");
592 for (i
= 1 ; i
< argc
; i
++) {
593 const char *path
= argv
[i
];
596 if (allow_options
&& *path
== '-') {
597 if (!strcmp(path
, "--")) {
601 if (!strcmp(path
, "-q")) {
602 refresh_flags
|= REFRESH_QUIET
;
605 if (!strcmp(path
, "--ignore-submodules")) {
606 refresh_flags
|= REFRESH_IGNORE_SUBMODULES
;
609 if (!strcmp(path
, "--add")) {
613 if (!strcmp(path
, "--replace")) {
617 if (!strcmp(path
, "--remove")) {
621 if (!strcmp(path
, "--unmerged")) {
622 refresh_flags
|= REFRESH_UNMERGED
;
625 if (!strcmp(path
, "--refresh")) {
627 has_errors
|= refresh_cache(refresh_flags
);
630 if (!strcmp(path
, "--really-refresh")) {
632 has_errors
|= refresh_cache(REFRESH_REALLY
| refresh_flags
);
635 if (!strcmp(path
, "--cacheinfo")) {
636 unsigned char sha1
[20];
640 die("git update-index: --cacheinfo <mode> <sha1> <path>");
642 if (strtoul_ui(argv
[i
+1], 8, &mode
) ||
643 get_sha1_hex(argv
[i
+2], sha1
) ||
644 add_cacheinfo(mode
, sha1
, argv
[i
+3], 0))
645 die("git update-index: --cacheinfo"
646 " cannot add %s", argv
[i
+3]);
650 if (!strcmp(path
, "--chmod=-x") ||
651 !strcmp(path
, "--chmod=+x")) {
653 die("git update-index: %s <path>", path
);
654 set_executable_bit
= path
[8];
657 if (!strcmp(path
, "--assume-unchanged")) {
658 mark_valid_only
= MARK_FLAG
;
661 if (!strcmp(path
, "--no-assume-unchanged")) {
662 mark_valid_only
= UNMARK_FLAG
;
665 if (!strcmp(path
, "--no-skip-worktree")) {
666 mark_skip_worktree_only
= UNMARK_FLAG
;
669 if (!strcmp(path
, "--skip-worktree")) {
670 mark_skip_worktree_only
= MARK_FLAG
;
673 if (!strcmp(path
, "--info-only")) {
677 if (!strcmp(path
, "--force-remove")) {
681 if (!strcmp(path
, "-z")) {
682 line_termination
= 0;
685 if (!strcmp(path
, "--stdin")) {
687 die("--stdin must be at the end");
691 if (!strcmp(path
, "--index-info")) {
693 die("--index-info must be at the end");
694 allow_add
= allow_replace
= allow_remove
= 1;
695 read_index_info(line_termination
);
698 if (!strcmp(path
, "--unresolve")) {
699 has_errors
= do_unresolve(argc
- i
, argv
+ i
,
700 prefix
, prefix_length
);
702 active_cache_changed
= 0;
705 if (!strcmp(path
, "--again") || !strcmp(path
, "-g")) {
707 has_errors
= do_reupdate(argc
- i
, argv
+ i
,
708 prefix
, prefix_length
);
710 active_cache_changed
= 0;
713 if (!strcmp(path
, "--ignore-missing")) {
714 refresh_flags
|= REFRESH_IGNORE_MISSING
;
717 if (!strcmp(path
, "--verbose")) {
721 if (!strcmp(path
, "-h") || !strcmp(path
, "--help"))
722 usage(update_index_usage
);
723 die("unknown option %s", path
);
726 p
= prefix_path(prefix
, prefix_length
, path
);
727 update_one(p
, NULL
, 0);
728 if (set_executable_bit
)
729 chmod_path(set_executable_bit
, p
);
730 if (p
< path
|| p
> path
+ strlen(path
))
733 if (read_from_stdin
) {
734 struct strbuf buf
= STRBUF_INIT
, nbuf
= STRBUF_INIT
;
737 while (strbuf_getline(&buf
, stdin
, line_termination
) != EOF
) {
739 if (line_termination
&& buf
.buf
[0] == '"') {
741 if (unquote_c_style(&nbuf
, buf
.buf
, NULL
))
742 die("line is badly quoted");
743 strbuf_swap(&buf
, &nbuf
);
745 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
746 update_one(p
, NULL
, 0);
747 if (set_executable_bit
)
748 chmod_path(set_executable_bit
, p
);
749 if (p
< buf
.buf
|| p
> buf
.buf
+ buf
.len
)
752 strbuf_release(&nbuf
);
753 strbuf_release(&buf
);
757 if (active_cache_changed
) {
759 if (refresh_flags
& REFRESH_QUIET
)
761 unable_to_lock_index_die(get_index_file(), lock_error
);
763 if (write_cache(newfd
, active_cache
, active_nr
) ||
764 commit_locked_index(lock_file
))
765 die("Unable to write new index file");
768 rollback_lock_file(lock_file
);
770 return has_errors
? 1 : 0;