2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
8 #include "cache-tree.h"
12 #include "resolve-undo.h"
13 #include "parse-options.h"
16 * Default to not allowing changes to the list of files. The
17 * tool doesn't actually care, but this makes it harder to add
18 * files to the revision control by mistake by doing something
19 * like "git update-index *" and suddenly having all the object
20 * files be revision controlled.
23 static int allow_remove
;
24 static int allow_replace
;
26 static int force_remove
;
28 static int mark_valid_only
;
29 static int mark_skip_worktree_only
;
33 __attribute__((format (printf
, 1, 2)))
34 static void report(const char *fmt
, ...)
47 static int mark_ce_flags(const char *path
, int flag
, int mark
)
49 int namelen
= strlen(path
);
50 int pos
= cache_name_pos(path
, namelen
);
53 active_cache
[pos
]->ce_flags
|= flag
;
55 active_cache
[pos
]->ce_flags
&= ~flag
;
56 cache_tree_invalidate_path(active_cache_tree
, path
);
57 active_cache_changed
= 1;
63 static int remove_one_path(const char *path
)
66 return error("%s: does not exist and --remove not passed", path
);
67 if (remove_file_from_cache(path
))
68 return error("%s: cannot remove from the index", path
);
73 * Handle a path that couldn't be lstat'ed. It's either:
74 * - missing file (ENOENT or ENOTDIR). That's ok if we're
75 * supposed to be removing it and the removal actually
77 * - permission error. That's never ok.
79 static int process_lstat_error(const char *path
, int err
)
81 if (err
== ENOENT
|| err
== ENOTDIR
)
82 return remove_one_path(path
);
83 return error("lstat(\"%s\"): %s", path
, strerror(errno
));
86 static int add_one_path(struct cache_entry
*old
, const char *path
, int len
, struct stat
*st
)
89 struct cache_entry
*ce
;
91 /* Was the old index entry already up-to-date? */
92 if (old
&& !ce_stage(old
) && !ce_match_stat(old
, st
, 0))
95 size
= cache_entry_size(len
);
96 ce
= xcalloc(1, size
);
97 memcpy(ce
->name
, path
, len
);
99 fill_stat_cache_info(ce
, st
);
100 ce
->ce_mode
= ce_mode_from_stat(old
, st
->st_mode
);
102 if (index_path(ce
->sha1
, path
, st
,
103 info_only
? 0 : HASH_WRITE_OBJECT
)) {
107 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
108 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
109 if (add_cache_entry(ce
, option
))
110 return error("%s: cannot add to the index - missing --add option?", path
);
115 * Handle a path that was a directory. Four cases:
117 * - it's already a gitlink in the index, and we keep it that
118 * way, and update it if we can (if we cannot find the HEAD,
119 * we're going to keep it unchanged in the index!)
121 * - it's a *file* in the index, in which case it should be
122 * removed as a file if removal is allowed, since it doesn't
123 * exist as such any more. If removal isn't allowed, it's
126 * (NOTE! This is old and arguably fairly strange behaviour.
127 * We might want to make this an error unconditionally, and
128 * use "--force-remove" if you actually want to force removal).
130 * - it used to exist as a subdirectory (ie multiple files with
131 * this particular prefix) in the index, in which case it's wrong
132 * to try to update it as a directory.
134 * - it doesn't exist at all in the index, but it is a valid
135 * git directory, and it should be *added* as a gitlink.
137 static int process_directory(const char *path
, int len
, struct stat
*st
)
139 unsigned char sha1
[20];
140 int pos
= cache_name_pos(path
, len
);
142 /* Exact match: file or existing gitlink */
144 struct cache_entry
*ce
= active_cache
[pos
];
145 if (S_ISGITLINK(ce
->ce_mode
)) {
147 /* Do nothing to the index if there is no HEAD! */
148 if (resolve_gitlink_ref(path
, "HEAD", sha1
) < 0)
151 return add_one_path(ce
, path
, len
, st
);
153 /* Should this be an unconditional error? */
154 return remove_one_path(path
);
157 /* Inexact match: is there perhaps a subdirectory match? */
159 while (pos
< active_nr
) {
160 struct cache_entry
*ce
= active_cache
[pos
++];
162 if (strncmp(ce
->name
, path
, len
))
164 if (ce
->name
[len
] > '/')
166 if (ce
->name
[len
] < '/')
169 /* Subdirectory match - error out */
170 return error("%s: is a directory - add individual files instead", path
);
173 /* No match - should we add it as a gitlink? */
174 if (!resolve_gitlink_ref(path
, "HEAD", sha1
))
175 return add_one_path(NULL
, path
, len
, st
);
178 return error("%s: is a directory - add files inside instead", path
);
181 static int process_path(const char *path
)
185 struct cache_entry
*ce
;
188 if (has_symlink_leading_path(path
, len
))
189 return error("'%s' is beyond a symbolic link", path
);
191 pos
= cache_name_pos(path
, len
);
192 ce
= pos
< 0 ? NULL
: active_cache
[pos
];
193 if (ce
&& ce_skip_worktree(ce
)) {
195 * working directory version is assumed "good"
196 * so updating it does not make sense.
197 * On the other hand, removing it from index should work
199 if (allow_remove
&& remove_file_from_cache(path
))
200 return error("%s: cannot remove from the index", path
);
205 * First things first: get the stat information, to decide
206 * what to do about the pathname!
208 if (lstat(path
, &st
) < 0)
209 return process_lstat_error(path
, errno
);
211 if (S_ISDIR(st
.st_mode
))
212 return process_directory(path
, len
, &st
);
215 * Process a regular file
217 if (ce
&& S_ISGITLINK(ce
->ce_mode
))
218 return error("%s is already a gitlink, not replacing", path
);
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(len
, stage
);
239 ce
->ce_mode
= create_ce_mode(mode
);
240 if (assume_unchanged
)
241 ce
->ce_flags
|= CE_VALID
;
242 option
= allow_add
? ADD_CACHE_OK_TO_ADD
: 0;
243 option
|= allow_replace
? ADD_CACHE_OK_TO_REPLACE
: 0;
244 if (add_cache_entry(ce
, option
))
245 return error("%s: cannot add to the index - missing --add option?",
247 report("add '%s'", path
);
251 static void chmod_path(int flip
, const char *path
)
254 struct cache_entry
*ce
;
257 pos
= cache_name_pos(path
, strlen(path
));
260 ce
= active_cache
[pos
];
266 ce
->ce_mode
|= 0111; break;
268 ce
->ce_mode
&= ~0111; break;
272 cache_tree_invalidate_path(active_cache_tree
, path
);
273 active_cache_changed
= 1;
274 report("chmod %cx '%s'", flip
, path
);
277 die("git update-index: cannot chmod %cx '%s'", flip
, path
);
280 static void update_one(const char *path
, const char *prefix
, int prefix_length
)
282 const char *p
= prefix_path(prefix
, prefix_length
, path
);
283 if (!verify_path(p
)) {
284 fprintf(stderr
, "Ignoring path %s\n", path
);
287 if (mark_valid_only
) {
288 if (mark_ce_flags(p
, CE_VALID
, mark_valid_only
== MARK_FLAG
))
289 die("Unable to mark file %s", path
);
292 if (mark_skip_worktree_only
) {
293 if (mark_ce_flags(p
, CE_SKIP_WORKTREE
, mark_skip_worktree_only
== MARK_FLAG
))
294 die("Unable to mark file %s", path
);
299 if (remove_file_from_cache(p
))
300 die("git update-index: unable to remove %s", path
);
301 report("remove '%s'", path
);
305 die("Unable to process path %s", path
);
306 report("add '%s'", path
);
308 if (p
< path
|| p
> path
+ strlen(path
))
312 static void read_index_info(int line_termination
)
314 struct strbuf buf
= STRBUF_INIT
;
315 struct strbuf uq
= STRBUF_INIT
;
317 while (strbuf_getline(&buf
, stdin
, line_termination
) != EOF
) {
320 unsigned char sha1
[20];
325 /* This reads lines formatted in one of three formats:
327 * (1) mode SP sha1 TAB path
328 * The first format is what "git apply --index-info"
329 * reports, and used to reconstruct a partial tree
330 * that is used for phony merge base tree when falling
331 * back on 3-way merge.
333 * (2) mode SP type SP sha1 TAB path
334 * The second format is to stuff "git ls-tree" output
335 * into the index file.
337 * (3) mode SP sha1 SP stage TAB path
338 * This format is to put higher order stages into the
339 * index file and matches "git ls-files --stage" output.
342 ul
= strtoul(buf
.buf
, &ptr
, 8);
343 if (ptr
== buf
.buf
|| *ptr
!= ' '
344 || errno
|| (unsigned int) ul
!= ul
)
348 tab
= strchr(ptr
, '\t');
349 if (!tab
|| tab
- ptr
< 41)
352 if (tab
[-2] == ' ' && '0' <= tab
[-1] && tab
[-1] <= '3') {
353 stage
= tab
[-1] - '0';
354 ptr
= tab
+ 1; /* point at the head of path */
355 tab
= tab
- 2; /* point at tail of sha1 */
359 ptr
= tab
+ 1; /* point at the head of path */
362 if (get_sha1_hex(tab
- 40, sha1
) || tab
[-41] != ' ')
366 if (line_termination
&& path_name
[0] == '"') {
368 if (unquote_c_style(&uq
, path_name
, NULL
)) {
369 die("git update-index: bad quoting of path name");
374 if (!verify_path(path_name
)) {
375 fprintf(stderr
, "Ignoring path %s\n", path_name
);
380 /* mode == 0 means there is no such path -- remove */
381 if (remove_file_from_cache(path_name
))
382 die("git update-index: unable to remove %s",
386 /* mode ' ' sha1 '\t' name
387 * ptr[-1] points at tab,
388 * ptr[-41] is at the beginning of sha1
390 ptr
[-42] = ptr
[-1] = 0;
391 if (add_cacheinfo(mode
, sha1
, path_name
, stage
))
392 die("git update-index: unable to update %s",
398 die("malformed index info %s", buf
.buf
);
400 strbuf_release(&buf
);
404 static const char * const update_index_usage
[] = {
405 "git update-index [options] [--] [<file>...]",
409 static unsigned char head_sha1
[20];
410 static unsigned char merge_head_sha1
[20];
412 static struct cache_entry
*read_one_ent(const char *which
,
413 unsigned char *ent
, const char *path
,
414 int namelen
, int stage
)
417 unsigned char sha1
[20];
419 struct cache_entry
*ce
;
421 if (get_tree_entry(ent
, path
, sha1
, &mode
)) {
423 error("%s: not in %s branch.", path
, which
);
426 if (mode
== S_IFDIR
) {
428 error("%s: not a blob in %s branch.", path
, which
);
431 size
= cache_entry_size(namelen
);
432 ce
= xcalloc(1, size
);
434 hashcpy(ce
->sha1
, sha1
);
435 memcpy(ce
->name
, path
, namelen
);
436 ce
->ce_flags
= create_ce_flags(namelen
, stage
);
437 ce
->ce_mode
= create_ce_mode(mode
);
441 static int unresolve_one(const char *path
)
443 int namelen
= strlen(path
);
446 struct cache_entry
*ce_2
= NULL
, *ce_3
= NULL
;
448 /* See if there is such entry in the index. */
449 pos
= cache_name_pos(path
, namelen
);
452 pos
= unmerge_cache_entry_at(pos
);
453 if (pos
< active_nr
) {
454 struct cache_entry
*ce
= active_cache
[pos
];
456 ce_namelen(ce
) == namelen
&&
457 !memcmp(ce
->name
, path
, namelen
))
460 /* no resolve-undo information; fall back */
462 /* If there isn't, either it is unmerged, or
463 * resolved as "removed" by mistake. We do not
464 * want to do anything in the former case.
467 if (pos
< active_nr
) {
468 struct cache_entry
*ce
= active_cache
[pos
];
469 if (ce_namelen(ce
) == namelen
&&
470 !memcmp(ce
->name
, path
, namelen
)) {
472 "%s: skipping still unmerged path.\n",
479 /* Grab blobs from given path from HEAD and MERGE_HEAD,
480 * stuff HEAD version in stage #2,
481 * stuff MERGE_HEAD version in stage #3.
483 ce_2
= read_one_ent("our", head_sha1
, path
, namelen
, 2);
484 ce_3
= read_one_ent("their", merge_head_sha1
, path
, namelen
, 3);
486 if (!ce_2
|| !ce_3
) {
490 if (!hashcmp(ce_2
->sha1
, ce_3
->sha1
) &&
491 ce_2
->ce_mode
== ce_3
->ce_mode
) {
492 fprintf(stderr
, "%s: identical in both, skipping.\n",
497 remove_file_from_cache(path
);
498 if (add_cache_entry(ce_2
, ADD_CACHE_OK_TO_ADD
)) {
499 error("%s: cannot add our version to the index.", path
);
503 if (!add_cache_entry(ce_3
, ADD_CACHE_OK_TO_ADD
))
505 error("%s: cannot add their version to the index.", path
);
513 static void read_head_pointers(void)
515 if (read_ref("HEAD", head_sha1
))
516 die("No HEAD -- no initial commit yet?");
517 if (read_ref("MERGE_HEAD", merge_head_sha1
)) {
518 fprintf(stderr
, "Not in the middle of a merge.\n");
523 static int do_unresolve(int ac
, const char **av
,
524 const char *prefix
, int prefix_length
)
529 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
530 * are not doing a merge, so exit with success status.
532 read_head_pointers();
534 for (i
= 1; i
< ac
; i
++) {
535 const char *arg
= av
[i
];
536 const char *p
= prefix_path(prefix
, prefix_length
, arg
);
537 err
|= unresolve_one(p
);
538 if (p
< arg
|| p
> arg
+ strlen(arg
))
544 static int do_reupdate(int ac
, const char **av
,
545 const char *prefix
, int prefix_length
)
547 /* Read HEAD and run update-index on paths that are
548 * merged and already different between index and HEAD.
552 const char **paths
= get_pathspec(prefix
, av
+ 1);
553 struct pathspec pathspec
;
555 init_pathspec(&pathspec
, paths
);
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 struct cache_entry
*ce
= active_cache
[pos
];
565 struct cache_entry
*old
= NULL
;
568 if (ce_stage(ce
) || !ce_path_match(ce
, &pathspec
))
571 old
= read_one_ent(NULL
, head_sha1
,
572 ce
->name
, ce_namelen(ce
), 0);
573 if (old
&& ce
->ce_mode
== old
->ce_mode
&&
574 !hashcmp(ce
->sha1
, old
->sha1
)) {
576 continue; /* unchanged */
578 /* Be careful. The working tree may not have the
579 * path anymore, in which case, under 'allow_remove',
580 * or worse yet 'allow_replace', active_nr may decrease.
583 update_one(ce
->name
+ prefix_length
, prefix
, prefix_length
);
584 if (save_nr
!= active_nr
)
587 free_pathspec(&pathspec
);
591 struct refresh_params
{
596 static int refresh(struct refresh_params
*o
, unsigned int flag
)
599 *o
->has_errors
|= refresh_cache(o
->flags
| flag
);
603 static int refresh_callback(const struct option
*opt
,
604 const char *arg
, int unset
)
606 return refresh(opt
->value
, 0);
609 static int really_refresh_callback(const struct option
*opt
,
610 const char *arg
, int unset
)
612 return refresh(opt
->value
, REFRESH_REALLY
);
615 static int chmod_callback(const struct option
*opt
,
616 const char *arg
, int unset
)
618 char *flip
= opt
->value
;
619 if ((arg
[0] != '-' && arg
[0] != '+') || arg
[1] != 'x' || arg
[2])
620 return error("option 'chmod' expects \"+x\" or \"-x\"");
625 static int resolve_undo_clear_callback(const struct option
*opt
,
626 const char *arg
, int unset
)
628 resolve_undo_clear();
632 static int cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
633 const struct option
*opt
, int unset
)
635 unsigned char sha1
[20];
639 return error("option 'cacheinfo' expects three arguments");
640 if (strtoul_ui(*++ctx
->argv
, 8, &mode
) ||
641 get_sha1_hex(*++ctx
->argv
, sha1
) ||
642 add_cacheinfo(mode
, sha1
, *++ctx
->argv
, 0))
643 die("git update-index: --cacheinfo cannot add %s", *ctx
->argv
);
648 static int stdin_cacheinfo_callback(struct parse_opt_ctx_t
*ctx
,
649 const struct option
*opt
, int unset
)
651 int *line_termination
= opt
->value
;
654 return error("option '%s' must be the last argument", opt
->long_name
);
655 allow_add
= allow_replace
= allow_remove
= 1;
656 read_index_info(*line_termination
);
660 static int stdin_callback(struct parse_opt_ctx_t
*ctx
,
661 const struct option
*opt
, int unset
)
663 int *read_from_stdin
= opt
->value
;
666 return error("option '%s' must be the last argument", opt
->long_name
);
667 *read_from_stdin
= 1;
671 static int unresolve_callback(struct parse_opt_ctx_t
*ctx
,
672 const struct option
*opt
, int flags
)
674 int *has_errors
= opt
->value
;
675 const char *prefix
= startup_info
->prefix
;
677 /* consume remaining arguments. */
678 *has_errors
= do_unresolve(ctx
->argc
, ctx
->argv
,
679 prefix
, prefix
? strlen(prefix
) : 0);
681 active_cache_changed
= 0;
683 ctx
->argv
+= ctx
->argc
- 1;
688 static int reupdate_callback(struct parse_opt_ctx_t
*ctx
,
689 const struct option
*opt
, int flags
)
691 int *has_errors
= opt
->value
;
692 const char *prefix
= startup_info
->prefix
;
694 /* consume remaining arguments. */
696 *has_errors
= do_reupdate(ctx
->argc
, ctx
->argv
,
697 prefix
, prefix
? strlen(prefix
) : 0);
699 active_cache_changed
= 0;
701 ctx
->argv
+= ctx
->argc
- 1;
706 int cmd_update_index(int argc
, const char **argv
, const char *prefix
)
708 int newfd
, entries
, has_errors
= 0, line_termination
= '\n';
709 int read_from_stdin
= 0;
710 int prefix_length
= prefix
? strlen(prefix
) : 0;
711 char set_executable_bit
= 0;
712 struct refresh_params refresh_args
= {0, &has_errors
};
714 struct lock_file
*lock_file
;
715 struct parse_opt_ctx_t ctx
;
716 int parseopt_state
= PARSE_OPT_UNKNOWN
;
717 struct option options
[] = {
718 OPT_BIT('q', NULL
, &refresh_args
.flags
,
719 "continue refresh even when index needs update",
721 OPT_BIT(0, "ignore-submodules", &refresh_args
.flags
,
722 "refresh: ignore submodules",
723 REFRESH_IGNORE_SUBMODULES
),
724 OPT_SET_INT(0, "add", &allow_add
,
725 "do not ignore new files", 1),
726 OPT_SET_INT(0, "replace", &allow_replace
,
727 "let files replace directories and vice-versa", 1),
728 OPT_SET_INT(0, "remove", &allow_remove
,
729 "notice files missing from worktree", 1),
730 OPT_BIT(0, "unmerged", &refresh_args
.flags
,
731 "refresh even if index contains unmerged entries",
733 {OPTION_CALLBACK
, 0, "refresh", &refresh_args
, NULL
,
734 "refresh stat information",
735 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
737 {OPTION_CALLBACK
, 0, "really-refresh", &refresh_args
, NULL
,
738 "like --refresh, but ignore assume-unchanged setting",
739 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
740 really_refresh_callback
},
741 {OPTION_LOWLEVEL_CALLBACK
, 0, "cacheinfo", NULL
,
742 "<mode> <object> <path>",
743 "add the specified entry to the index",
744 PARSE_OPT_NOARG
| /* disallow --cacheinfo=<mode> form */
745 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
746 (parse_opt_cb
*) cacheinfo_callback
},
747 {OPTION_CALLBACK
, 0, "chmod", &set_executable_bit
, "(+/-)x",
748 "override the executable bit of the listed files",
749 PARSE_OPT_NONEG
| PARSE_OPT_LITERAL_ARGHELP
,
751 {OPTION_SET_INT
, 0, "assume-unchanged", &mark_valid_only
, NULL
,
752 "mark files as \"not changing\"",
753 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
754 {OPTION_SET_INT
, 0, "no-assume-unchanged", &mark_valid_only
, NULL
,
755 "clear assumed-unchanged bit",
756 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
757 {OPTION_SET_INT
, 0, "skip-worktree", &mark_skip_worktree_only
, NULL
,
758 "mark files as \"index-only\"",
759 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, MARK_FLAG
},
760 {OPTION_SET_INT
, 0, "no-skip-worktree", &mark_skip_worktree_only
, NULL
,
761 "clear skip-worktree bit",
762 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
, UNMARK_FLAG
},
763 OPT_SET_INT(0, "info-only", &info_only
,
764 "add to index only; do not add content to object database", 1),
765 OPT_SET_INT(0, "force-remove", &force_remove
,
766 "remove named paths even if present in worktree", 1),
767 OPT_SET_INT('z', NULL
, &line_termination
,
768 "with --stdin: input lines are terminated by null bytes", '\0'),
769 {OPTION_LOWLEVEL_CALLBACK
, 0, "stdin", &read_from_stdin
, NULL
,
770 "read list of paths to be updated from standard input",
771 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
772 (parse_opt_cb
*) stdin_callback
},
773 {OPTION_LOWLEVEL_CALLBACK
, 0, "index-info", &line_termination
, NULL
,
774 "add entries from standard input to the index",
775 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
776 (parse_opt_cb
*) stdin_cacheinfo_callback
},
777 {OPTION_LOWLEVEL_CALLBACK
, 0, "unresolve", &has_errors
, NULL
,
778 "repopulate stages #2 and #3 for the listed paths",
779 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
780 (parse_opt_cb
*) unresolve_callback
},
781 {OPTION_LOWLEVEL_CALLBACK
, 'g', "again", &has_errors
, NULL
,
782 "only update entries that differ from HEAD",
783 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
784 (parse_opt_cb
*) reupdate_callback
},
785 OPT_BIT(0, "ignore-missing", &refresh_args
.flags
,
786 "ignore files missing from worktree",
787 REFRESH_IGNORE_MISSING
),
788 OPT_SET_INT(0, "verbose", &verbose
,
789 "report actions to standard output", 1),
790 {OPTION_CALLBACK
, 0, "clear-resolve-undo", NULL
, NULL
,
791 "(for porcelains) forget saved unresolved conflicts",
792 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
,
793 resolve_undo_clear_callback
},
797 if (argc
== 2 && !strcmp(argv
[1], "-h"))
798 usage(update_index_usage
[0]);
800 git_config(git_default_config
, NULL
);
802 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
803 lock_file
= xcalloc(1, sizeof(struct lock_file
));
805 newfd
= hold_locked_index(lock_file
, 0);
809 entries
= read_cache();
811 die("cache corrupted");
814 * Custom copy of parse_options() because we want to handle
815 * filename arguments as they come.
817 parse_options_start(&ctx
, argc
, argv
, prefix
,
818 options
, PARSE_OPT_STOP_AT_NON_OPTION
);
820 if (parseopt_state
!= PARSE_OPT_DONE
)
821 parseopt_state
= parse_options_step(&ctx
, options
,
825 switch (parseopt_state
) {
828 case PARSE_OPT_NON_OPTION
:
831 const char *path
= ctx
.argv
[0];
835 p
= prefix_path(prefix
, prefix_length
, path
);
836 update_one(p
, NULL
, 0);
837 if (set_executable_bit
)
838 chmod_path(set_executable_bit
, p
);
839 if (p
< path
|| p
> path
+ strlen(path
))
845 case PARSE_OPT_UNKNOWN
:
846 if (ctx
.argv
[0][1] == '-')
847 error("unknown option '%s'", ctx
.argv
[0] + 2);
849 error("unknown switch '%c'", *ctx
.opt
);
850 usage_with_options(update_index_usage
, options
);
853 argc
= parse_options_end(&ctx
);
855 if (read_from_stdin
) {
856 struct strbuf buf
= STRBUF_INIT
, nbuf
= STRBUF_INIT
;
859 while (strbuf_getline(&buf
, stdin
, line_termination
) != EOF
) {
861 if (line_termination
&& buf
.buf
[0] == '"') {
863 if (unquote_c_style(&nbuf
, buf
.buf
, NULL
))
864 die("line is badly quoted");
865 strbuf_swap(&buf
, &nbuf
);
867 p
= prefix_path(prefix
, prefix_length
, buf
.buf
);
868 update_one(p
, NULL
, 0);
869 if (set_executable_bit
)
870 chmod_path(set_executable_bit
, p
);
871 if (p
< buf
.buf
|| p
> buf
.buf
+ buf
.len
)
874 strbuf_release(&nbuf
);
875 strbuf_release(&buf
);
878 if (active_cache_changed
) {
880 if (refresh_args
.flags
& REFRESH_QUIET
)
882 unable_to_lock_index_die(get_index_file(), lock_error
);
884 if (write_cache(newfd
, active_cache
, active_nr
) ||
885 commit_locked_index(lock_file
))
886 die("Unable to write new index file");
889 rollback_lock_file(lock_file
);
891 return has_errors
? 1 : 0;