2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
9 #include "cache-tree.h"
10 #include "tree-walk.h"
13 #include "resolve-undo.h"
14 #include "parse-options.h"
17 #include "split-index.h"
20 * Default to not allowing changes to the list of files. The
21 * tool doesn't actually care, but this makes it harder to add
22 * files to the revision control by mistake by doing something
23 * like "git update-index *" and suddenly having all the object
24 * files be revision controlled.
27 static int allow_remove
;
28 static int allow_replace
;
30 static int force_remove
;
32 static int mark_valid_only
;
33 static int mark_skip_worktree_only
;
37 __attribute__((format (printf
, 1, 2)))
38 static void report(const char *fmt
, ...)
51 static int mark_ce_flags(const char *path
, int flag
, int mark
)
53 int namelen
= strlen(path
);
54 int pos
= cache_name_pos(path
, namelen
);
57 active_cache
[pos
]->ce_flags
|= flag
;
59 active_cache
[pos
]->ce_flags
&= ~flag
;
60 active_cache
[pos
]->ce_flags
|= CE_UPDATE_IN_BASE
;
61 cache_tree_invalidate_path(&the_index
, path
);
62 active_cache_changed
|= CE_ENTRY_CHANGED
;
68 static int remove_one_path(const char *path
)
71 return error("%s: does not exist and --remove not passed", path
);
72 if (remove_file_from_cache(path
))
73 return error("%s: cannot remove from the index", path
);
78 * Handle a path that couldn't be lstat'ed. It's either:
79 * - missing file (ENOENT or ENOTDIR). That's ok if we're
80 * supposed to be removing it and the removal actually
82 * - permission error. That's never ok.
84 static int process_lstat_error(const char *path
, int err
)
86 if (err
== ENOENT
|| err
== ENOTDIR
)
87 return remove_one_path(path
);
88 return error("lstat(\"%s\"): %s", path
, strerror(errno
));
91 static int add_one_path(const struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
94 struct cache_entry
*ce
;
96 /* Was the old index entry already up-to-date? */
97 if (old
&& !ce_stage(old
) && !ce_match_stat(old
, st
, 0))
100 size
= cache_entry_size(len
);
101 ce
= xcalloc(1, size
);
102 memcpy(ce
->name
, path
, len
);
103 ce
->ce_flags
= create_ce_flags(0);
104 ce
->ce_namelen
= len
;
105 fill_stat_cache_info(ce
, st
);
106 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
108 if (index_path(ce
->sha1
, path
, st
,
109 info_only
? 0 : HASH_WRITE_OBJECT
)) {
113 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
114 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
115 if (add_cache_entry(ce
, option
))
116 return error("%s: cannot add to the index - missing --add option?", path
);
121 * Handle a path that was a directory. Four cases:
123 * - it's already a gitlink in the index, and we keep it that
124 * way, and update it if we can (if we cannot find the HEAD,
125 * we're going to keep it unchanged in the index!)
127 * - it's a *file* in the index, in which case it should be
128 * removed as a file if removal is allowed, since it doesn't
129 * exist as such any more. If removal isn't allowed, it's
132 * (NOTE! This is old and arguably fairly strange behaviour.
133 * We might want to make this an error unconditionally, and
134 * use "--force-remove" if you actually want to force removal).
136 * - it used to exist as a subdirectory (ie multiple files with
137 * this particular prefix) in the index, in which case it's wrong
138 * to try to update it as a directory.
140 * - it doesn't exist at all in the index, but it is a valid
141 * git directory, and it should be *added* as a gitlink.
143 static int process_directory(const char *path
, int len
, struct stat
*st
)
145 unsigned char sha1
[20];
146 int pos
= cache_name_pos(path
, len
);
148 /* Exact match: file or existing gitlink */
150 const struct cache_entry
*ce
= active_cache
[pos
];
151 if (S_ISGITLINK(ce
->ce_mode
)) {
153 /* Do nothing to the index if there is no HEAD! */
154 if (resolve_gitlink_ref(path
, "HEAD", sha1
) < 0)
157 return add_one_path(ce
, path
, len
, st
);
159 /* Should this be an unconditional error? */
160 return remove_one_path(path
);
163 /* Inexact match: is there perhaps a subdirectory match? */
165 while (pos
< active_nr
) {
166 const struct cache_entry
*ce
= active_cache
[pos
++];
168 if (strncmp(ce
->name
, path
, len
))
170 if (ce
->name
[len
] > '/')
172 if (ce
->name
[len
] < '/')
175 /* Subdirectory match - error out */
176 return error("%s: is a directory - add individual files instead", path
);
179 /* No match - should we add it as a gitlink? */
180 if (!resolve_gitlink_ref(path
, "HEAD", sha1
))
181 return add_one_path(NULL
, path
, len
, st
);
184 return error("%s: is a directory - add files inside instead", path
);
187 static int process_path(const char *path
)
191 const struct cache_entry
*ce
;
194 if (has_symlink_leading_path(path
, len
))
195 return error("'%s' is beyond a symbolic link", path
);
197 pos
= cache_name_pos(path
, len
);
198 ce
= pos
< 0 ? NULL
: active_cache
[pos
];
199 if (ce
&& ce_skip_worktree(ce
)) {
201 * working directory version is assumed "good"
202 * so updating it does not make sense.
203 * On the other hand, removing it from index should work
205 if (allow_remove
&& remove_file_from_cache(path
))
206 return error("%s: cannot remove from the index", path
);
211 * First things first: get the stat information, to decide
212 * what to do about the pathname!
214 if (lstat(path
, &st
) < 0)
215 return process_lstat_error(path
, errno
);
217 if (S_ISDIR(st
.st_mode
))
218 return process_directory(path
, len
, &st
);
220 return add_one_path(ce
, path
, len
, &st
);
223 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
224 const char *path
, int stage
)
226 int size
, len
, option
;
227 struct cache_entry
*ce
;
229 if (!verify_path(path
))
230 return error("Invalid path '%s'", path
);
233 size
= cache_entry_size(len
);
234 ce
= xcalloc(1, size
);
236 hashcpy(ce
->sha1
, sha1
);
237 memcpy(ce
->name
, path
, len
);
238 ce
->ce_flags
= create_ce_flags(stage
);
239 ce
->ce_namelen
= len
;
240 ce
->ce_mode
= create_ce_mode(mode
);
241 if (assume_unchanged
)
242 ce
->ce_flags
|= CE_VALID
;
243 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
244 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
245 if (add_cache_entry(ce
, option
))
246 return error("%s: cannot add to the index - missing --add option?",
248 report("add '%s'", path
);
252 static void chmod_path(int flip
, const char *path
)
255 struct cache_entry
*ce
;
258 pos
= cache_name_pos(path
, strlen(path
));
261 ce
= active_cache
[pos
];
267 ce
->ce_mode
|= 0111; break;
269 ce
->ce_mode
&= ~0111; break;
273 cache_tree_invalidate_path(&the_index
, path
);
274 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
275 active_cache_changed
|= CE_ENTRY_CHANGED
;
276 report("chmod %cx '%s'", flip
, path
);
279 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
282 static void update_one(const char *path
)
284 if (!verify_path(path
)) {
285 fprintf(stderr
, "Ignoring path %s\n", path
);
288 if (mark_valid_only
) {
289 if (mark_ce_flags(path
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
290 die("Unable to mark file %s", path
);
293 if (mark_skip_worktree_only
) {
294 if (mark_ce_flags(path
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
295 die("Unable to mark file %s", path
);
300 if (remove_file_from_cache(path
))
301 die("git update-index: unable to remove %s", path
);
302 report("remove '%s'", path
);
305 if (process_path(path
))
306 die("Unable to process path %s", path
);
307 report("add '%s'", path
);
310 static void read_index_info(int line_termination
)
312 struct strbuf buf
= STRBUF_INIT
;
313 struct strbuf uq
= STRBUF_INIT
;
315 while (strbuf_getline(&buf
, stdin
, line_termination
) != EOF
) {
318 unsigned char sha1
[20];
323 /* This reads lines formatted in one of three formats:
325 * (1) mode SP sha1 TAB path
326 * The first format is what "git apply --index-info"
327 * reports, and used to reconstruct a partial tree
328 * that is used for phony merge base tree when falling
329 * back on 3-way merge.
331 * (2) mode SP type SP sha1 TAB path
332 * The second format is to stuff "git ls-tree" output
333 * into the index file.
335 * (3) mode SP sha1 SP stage TAB path
336 * This format is to put higher order stages into the
337 * index file and matches "git ls-files --stage" output.
340 ul
= strtoul(buf
.buf
, &ptr
, 8);
341 if (ptr
== buf
.buf
|| *ptr
!= ' '
342 || errno
|| (unsigned int) ul
!= ul
)
346 tab
= strchr(ptr
, '\t');
347 if (!tab
|| tab
- ptr
< 41)
350 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
351 stage
= tab
[-1] - '0';
352 ptr
= tab
+ 1; /* point at the head of path */
353 tab
= tab
- 2; /* point at tail of sha1 */
357 ptr
= tab
+ 1; /* point at the head of path */
360 if (get_sha1_hex(tab
- 40, sha1
) || tab
[-41] != ' ')
364 if (line_termination
&& path_name
[0] == '"') {
366 if (unquote_c_style(&uq
, path_name
, NULL
)) {
367 die("git update-index: bad quoting of path name");
372 if (!verify_path(path_name
)) {
373 fprintf(stderr
, "Ignoring path %s\n", path_name
);
378 /* mode == 0 means there is no such path -- remove */
379 if (remove_file_from_cache(path_name
))
380 die("git update-index: unable to remove %s",
384 /* mode ' ' sha1 '\t' name
385 * ptr[-1] points at tab,
386 * ptr[-41] is at the beginning of sha1
388 ptr
[-42] = ptr
[-1] = 0;
389 if (add_cacheinfo(mode
, sha1
, path_name
, stage
))
390 die("git update-index: unable to update %s",
396 die("malformed index info %s", buf
.buf
);
398 strbuf_release(&buf
);
402 static const char * const update_index_usage
[] = {
403 N_("git update-index [options] [--] [<file>...]"),
407 static unsigned char head_sha1
[20];
408 static unsigned char merge_head_sha1
[20];
410 static struct cache_entry
*read_one_ent(const char *which
,
411 unsigned char *ent
, const char *path
,
412 int namelen
, int stage
)
415 unsigned char sha1
[20];
417 struct cache_entry
*ce
;
419 if (get_tree_entry(ent
, path
, sha1
, &mode
)) {
421 error("%s: not in %s branch.", path
, which
);
424 if (mode
== S_IFDIR
) {
426 error("%s: not a blob in %s branch.", path
, which
);
429 size
= cache_entry_size(namelen
);
430 ce
= xcalloc(1, size
);
432 hashcpy(ce
->sha1
, sha1
);
433 memcpy(ce
->name
, path
, namelen
);
434 ce
->ce_flags
= create_ce_flags(stage
);
435 ce
->ce_namelen
= namelen
;
436 ce
->ce_mode
= create_ce_mode(mode
);
440 static int unresolve_one(const char *path
)
442 int namelen
= strlen(path
);
445 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
447 /* See if there is such entry in the index. */
448 pos
= cache_name_pos(path
, namelen
);
451 pos
= unmerge_cache_entry_at(pos
);
452 if (pos
< active_nr
) {
453 const struct cache_entry
*ce
= active_cache
[pos
];
455 ce_namelen(ce
) == namelen
&&
456 !memcmp(ce
->name
, path
, namelen
))
459 /* no resolve-undo information; fall back */
461 /* If there isn't, either it is unmerged, or
462 * resolved as "removed" by mistake. We do not
463 * want to do anything in the former case.
466 if (pos
< active_nr
) {
467 const struct cache_entry
*ce
= active_cache
[pos
];
468 if (ce_namelen(ce
) == namelen
&&
469 !memcmp(ce
->name
, path
, namelen
)) {
471 "%s: skipping still unmerged path.\n",
478 /* Grab blobs from given path from HEAD and MERGE_HEAD,
479 * stuff HEAD version in stage #2,
480 * stuff MERGE_HEAD version in stage #3.
482 ce_2
= read_one_ent("our", head_sha1
, path
, namelen
, 2);
483 ce_3
= read_one_ent("their", merge_head_sha1
, path
, namelen
, 3);
485 if (!ce_2
|| !ce_3
) {
489 if (!hashcmp(ce_2
->sha1
, ce_3
->sha1
) &&
490 ce_2
->ce_mode
== ce_3
->ce_mode
) {
491 fprintf(stderr
, "%s: identical in both, skipping.\n",
496 remove_file_from_cache(path
);
497 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
498 error("%s: cannot add our version to the index.", path
);
502 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
504 error("%s: cannot add their version to the index.", path
);
512 static void read_head_pointers(void)
514 if (read_ref("HEAD", head_sha1
))
515 die("No HEAD -- no initial commit yet?");
516 if (read_ref("MERGE_HEAD", merge_head_sha1
)) {
517 fprintf(stderr
, "Not in the middle of a merge.\n");
522 static int do_unresolve(int ac
, const char **av
,
523 const char *prefix
, int prefix_length
)
528 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
529 * are not doing a merge, so exit with success status.
531 read_head_pointers();
533 for (i
= 1; i
< ac
; i
++) {
534 const char *arg
= av
[i
];
535 const char *p
= prefix_path(prefix
, prefix_length
, arg
);
536 err
|= unresolve_one(p
);
537 if (p
< arg
|| p
> arg
+ strlen(arg
))
543 static int do_reupdate(int ac
, const char **av
,
544 const char *prefix
, int prefix_length
)
546 /* Read HEAD and run update-index on paths that are
547 * merged and already different between index and HEAD.
551 struct pathspec pathspec
;
553 parse_pathspec(&pathspec
, 0,
557 if (read_ref("HEAD", head_sha1
))
558 /* If there is no HEAD, that means it is an initial
559 * commit. Update everything in the index.
563 for (pos
= 0; pos
< active_nr
; pos
++) {
564 const struct cache_entry
*ce
= active_cache
[pos
];
565 struct cache_entry
*old
= NULL
;
569 if (ce_stage(ce
) || !ce_path_match(ce
, &pathspec
, NULL
))
572 old
= read_one_ent(NULL
, head_sha1
,
573 ce
->name
, ce_namelen(ce
), 0);
574 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
575 !hashcmp(ce
->sha1
, old
->sha1
)) {
577 continue; /* unchanged */
579 /* Be careful. The working tree may not have the
580 * path anymore, in which case, under 'allow_remove',
581 * or worse yet 'allow_replace', active_nr may decrease.
584 path
= xstrdup(ce
->name
);
587 if (save_nr
!= active_nr
)
590 free_pathspec(&pathspec
);
594 struct refresh_params
{
599 static int refresh(struct refresh_params
*o
, unsigned int flag
)
602 read_cache_preload(NULL
);
603 *o
->has_errors
|= refresh_cache(o
->flags
| flag
);
607 static int refresh_callback(const struct option
*opt
,
608 const char *arg
, int unset
)
610 return refresh(opt
->value
, 0);
613 static int really_refresh_callback(const struct option
*opt
,
614 const char *arg
, int unset
)
616 return refresh(opt
->value
, REFRESH_REALLY
);
619 static int chmod_callback(const struct option
*opt
,
620 const char *arg
, int unset
)
622 char *flip
= opt
->value
;
623 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
624 return error("option 'chmod' expects \"+x\" or \"-x\"");
629 static int resolve_undo_clear_callback(const struct option
*opt
,
630 const char *arg
, int unset
)
632 resolve_undo_clear();
636 static int parse_new_style_cacheinfo(const char *arg
,
638 unsigned char sha1
[],
648 ul
= strtoul(arg
, &endp
, 8);
649 if (errno
|| endp
== arg
|| *endp
!= ',' || (unsigned int) ul
!= ul
)
650 return -1; /* not a new-style cacheinfo */
653 if (get_sha1_hex(endp
, sha1
) || endp
[40] != ',')
659 static int cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
660 const struct option
*opt
, int unset
)
662 unsigned char sha1
[20];
666 if (!parse_new_style_cacheinfo(ctx
->argv
[1], &mode
, sha1
, &path
)) {
667 if (add_cacheinfo(mode
, sha1
, path
, 0))
668 die("git update-index: --cacheinfo cannot add %s", path
);
674 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
675 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
676 get_sha1_hex(*++ctx
->argv
, sha1
) ||
677 add_cacheinfo(mode
, sha1
, *++ctx
->argv
, 0))
678 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
683 static int stdin_cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
684 const struct option
*opt
, int unset
)
686 int *line_termination
= opt
->value
;
689 return error("option '%s' must be the last argument", opt
->long_name
);
690 allow_add
= allow_replace
= allow_remove
= 1;
691 read_index_info(*line_termination
);
695 static int stdin_callback(struct parse_opt_ctx_t
*ctx
,
696 const struct option
*opt
, int unset
)
698 int *read_from_stdin
= opt
->value
;
701 return error("option '%s' must be the last argument", opt
->long_name
);
702 *read_from_stdin
= 1;
706 static int unresolve_callback(struct parse_opt_ctx_t
*ctx
,
707 const struct option
*opt
, int flags
)
709 int *has_errors
= opt
->value
;
710 const char *prefix
= startup_info
->prefix
;
712 /* consume remaining arguments. */
713 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
714 prefix
, prefix
? strlen(prefix
) : 0);
716 active_cache_changed
= 0;
718 ctx
->argv
+= ctx
->argc
- 1;
723 static int reupdate_callback(struct parse_opt_ctx_t
*ctx
,
724 const struct option
*opt
, int flags
)
726 int *has_errors
= opt
->value
;
727 const char *prefix
= startup_info
->prefix
;
729 /* consume remaining arguments. */
731 *has_errors
= do_reupdate(ctx
->argc
, ctx
->argv
,
732 prefix
, prefix
? strlen(prefix
) : 0);
734 active_cache_changed
= 0;
736 ctx
->argv
+= ctx
->argc
- 1;
741 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
743 int newfd
, entries
, has_errors
= 0, line_termination
= '\n';
744 int read_from_stdin
= 0;
745 int prefix_length
= prefix
? strlen(prefix
) : 0;
746 int preferred_index_format
= 0;
747 char set_executable_bit
= 0;
748 struct refresh_params refresh_args
= {0, &has_errors
};
750 int split_index
= -1;
751 struct lock_file
*lock_file
;
752 struct parse_opt_ctx_t ctx
;
753 int parseopt_state
= PARSE_OPT_UNKNOWN
;
754 struct option options
[] = {
755 OPT_BIT('q', NULL
, &refresh_args
.flags
,
756 N_("continue refresh even when index needs update"),
758 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
759 N_("refresh: ignore submodules"),
760 REFRESH_IGNORE_SUBMODULES
),
761 OPT_SET_INT(0, "add", &allow_add
,
762 N_("do not ignore new files"), 1),
763 OPT_SET_INT(0, "replace", &allow_replace
,
764 N_("let files replace directories and vice-versa"), 1),
765 OPT_SET_INT(0, "remove", &allow_remove
,
766 N_("notice files missing from worktree"), 1),
767 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
768 N_("refresh even if index contains unmerged entries"),
770 {OPTION_CALLBACK
, 0, "refresh", &refresh_args
, NULL
,
771 N_("refresh stat information"),
772 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
774 {OPTION_CALLBACK
, 0, "really-refresh", &refresh_args
, NULL
,
775 N_("like --refresh, but ignore assume-unchanged setting"),
776 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
777 really_refresh_callback
},
778 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
779 N_("<mode>,<object>,<path>"),
780 N_("add the specified entry to the index"),
781 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
782 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
783 (parse_opt_cb
*) cacheinfo_callback
},
784 {OPTION_CALLBACK
, 0, "chmod", &set_executable_bit
, N_("(+/-)x"),
785 N_("override the executable bit of the listed files"),
786 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
788 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
789 N_("mark files as \"not changing\""),
790 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
791 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
792 N_("clear assumed-unchanged bit"),
793 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
794 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
795 N_("mark files as \"index-only\""),
796 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
797 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
798 N_("clear skip-worktree bit"),
799 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
800 OPT_SET_INT(0, "info-only", &info_only
,
801 N_("add to index only; do not add content to object database"), 1),
802 OPT_SET_INT(0, "force-remove", &force_remove
,
803 N_("remove named paths even if present in worktree"), 1),
804 OPT_SET_INT('z', NULL
, &line_termination
,
805 N_("with --stdin: input lines are terminated by null bytes"), '\0'),
806 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
807 N_("read list of paths to be updated from standard input"),
808 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
809 (parse_opt_cb
*) stdin_callback
},
810 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &line_termination
, NULL
,
811 N_("add entries from standard input to the index"),
812 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
813 (parse_opt_cb
*) stdin_cacheinfo_callback
},
814 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
815 N_("repopulate stages #2 and #3 for the listed paths"),
816 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
817 (parse_opt_cb
*) unresolve_callback
},
818 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
819 N_("only update entries that differ from HEAD"),
820 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
821 (parse_opt_cb
*) reupdate_callback
},
822 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
823 N_("ignore files missing from worktree"),
824 REFRESH_IGNORE_MISSING
),
825 OPT_SET_INT(0, "verbose", &verbose
,
826 N_("report actions to standard output"), 1),
827 {OPTION_CALLBACK
, 0, "clear-resolve-undo", NULL
, NULL
,
828 N_("(for porcelains) forget saved unresolved conflicts"),
829 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
830 resolve_undo_clear_callback
},
831 OPT_INTEGER(0, "index-version", &preferred_index_format
,
832 N_("write index in this format")),
833 OPT_BOOL(0, "split-index", &split_index
,
834 N_("enable or disable split index")),
838 if (argc
== 2 && !strcmp(argv
[1], "-h"))
839 usage_with_options(update_index_usage
, options
);
841 git_config(git_default_config
, NULL
);
843 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
844 lock_file
= xcalloc(1, sizeof(struct lock_file
));
846 newfd
= hold_locked_index(lock_file
, 0);
850 entries
= read_cache();
852 die("cache corrupted");
855 * Custom copy of parse_options() because we want to handle
856 * filename arguments as they come.
858 parse_options_start(&ctx
, argc
, argv
, prefix
,
859 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
861 if (parseopt_state
!= PARSE_OPT_DONE
)
862 parseopt_state
= parse_options_step(&ctx
, options
,
866 switch (parseopt_state
) {
869 case PARSE_OPT_NON_OPTION
:
872 const char *path
= ctx
.argv
[0];
876 p
= prefix_path(prefix
, prefix_length
, path
);
878 if (set_executable_bit
)
879 chmod_path(set_executable_bit
, p
);
885 case PARSE_OPT_UNKNOWN
:
886 if (ctx
.argv
[0][1] == '-')
887 error("unknown option '%s'", ctx
.argv
[0] + 2);
889 error("unknown switch '%c'", *ctx
.opt
);
890 usage_with_options(update_index_usage
, options
);
893 argc
= parse_options_end(&ctx
);
894 if (preferred_index_format
) {
895 if (preferred_index_format
< INDEX_FORMAT_LB
||
896 INDEX_FORMAT_UB
< preferred_index_format
)
897 die("index-version %d not in range: %d..%d",
898 preferred_index_format
,
899 INDEX_FORMAT_LB
, INDEX_FORMAT_UB
);
901 if (the_index
.version
!= preferred_index_format
)
902 active_cache_changed
|= SOMETHING_CHANGED
;
903 the_index
.version
= preferred_index_format
;
906 if (read_from_stdin
) {
907 struct strbuf buf
= STRBUF_INIT
, nbuf
= STRBUF_INIT
;
910 while (strbuf_getline(&buf
, stdin
, line_termination
) != EOF
) {
912 if (line_termination
&& buf
.buf
[0] == '"') {
914 if (unquote_c_style(&nbuf
, buf
.buf
, NULL
))
915 die("line is badly quoted");
916 strbuf_swap(&buf
, &nbuf
);
918 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
920 if (set_executable_bit
)
921 chmod_path(set_executable_bit
, p
);
924 strbuf_release(&nbuf
);
925 strbuf_release(&buf
);
928 if (split_index
> 0) {
929 init_split_index(&the_index
);
930 the_index
.cache_changed
|= SPLIT_INDEX_ORDERED
;
931 } else if (!split_index
&& the_index
.split_index
) {
933 * can't discard_split_index(&the_index); because that
934 * will destroy split_index->base->cache[], which may
935 * be shared with the_index.cache[]. So yeah we're
936 * leaking a bit here.
938 the_index
.split_index
= NULL
;
939 the_index
.cache_changed
|= SOMETHING_CHANGED
;
942 if (active_cache_changed
) {
944 if (refresh_args
.flags
& REFRESH_QUIET
)
946 unable_to_lock_die(get_index_file(), lock_error
);
948 if (write_locked_index(&the_index
, lock_file
, COMMIT_LOCK
))
949 die("Unable to write new index file");
952 rollback_lock_file(lock_file
);
954 return has_errors
? 1 : 0;