]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/update-index.c
verify_dotfile: mention case-insensitivity in comment
[thirdparty/git.git] / builtin / update-index.c
CommitLineData
8bc9a0c7
LT
1/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
e83c5163 6#include "cache.h"
697cc8ef 7#include "lockfile.h"
973d6a20 8#include "quote.h"
a6e5642f 9#include "cache-tree.h"
2bd452d3 10#include "tree-walk.h"
fefe81c9 11#include "builtin.h"
e011054b 12#include "refs.h"
4a39f79d 13#include "resolve-undo.h"
309be813 14#include "parse-options.h"
64acde94 15#include "pathspec.h"
429bb40a 16#include "dir.h"
c18b80a0 17#include "split-index.h"
e83c5163 18
121481ab
LT
19/*
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
f18d244a 23 * like "git update-index *" and suddenly having all the object
121481ab
LT
24 * files be revision controlled.
25 */
caf4f582
JH
26static int allow_add;
27static int allow_remove;
28static int allow_replace;
caf4f582 29static int info_only;
9b63f501 30static int force_remove;
caf4f582 31static int verbose;
96f1e58f 32static int mark_valid_only;
44a36913 33static int mark_skip_worktree_only;
83b327ba
NTND
34#define MARK_FLAG 1
35#define UNMARK_FLAG 2
f64cb88d 36static struct strbuf mtime_dir = STRBUF_INIT;
5f73076c 37
113e6413
CC
38/* Untracked cache mode */
39enum uc_mode {
40 UC_UNSPECIFIED = -1,
41 UC_DISABLE = 0,
42 UC_ENABLE,
eaab83d0 43 UC_TEST,
113e6413
CC
44 UC_FORCE
45};
46
28bea9e5 47__attribute__((format (printf, 1, 2)))
caf4f582
JH
48static void report(const char *fmt, ...)
49{
50 va_list vp;
51
52 if (!verbose)
53 return;
54
55 va_start(vp, fmt);
56 vprintf(fmt, vp);
57 putchar('\n');
58 va_end(vp);
59}
60
f64cb88d
NTND
61static void remove_test_directory(void)
62{
63 if (mtime_dir.len)
64 remove_dir_recursively(&mtime_dir, 0);
65}
66
67static const char *get_mtime_path(const char *path)
68{
69 static struct strbuf sb = STRBUF_INIT;
70 strbuf_reset(&sb);
71 strbuf_addf(&sb, "%s/%s", mtime_dir.buf, path);
72 return sb.buf;
73}
74
75static void xmkdir(const char *path)
76{
77 path = get_mtime_path(path);
78 if (mkdir(path, 0700))
79 die_errno(_("failed to create directory %s"), path);
80}
81
82static int xstat_mtime_dir(struct stat *st)
83{
84 if (stat(mtime_dir.buf, st))
85 die_errno(_("failed to stat %s"), mtime_dir.buf);
86 return 0;
87}
88
89static int create_file(const char *path)
90{
91 int fd;
92 path = get_mtime_path(path);
93 fd = open(path, O_CREAT | O_RDWR, 0644);
94 if (fd < 0)
95 die_errno(_("failed to create file %s"), path);
96 return fd;
97}
98
99static void xunlink(const char *path)
100{
101 path = get_mtime_path(path);
102 if (unlink(path))
103 die_errno(_("failed to delete file %s"), path);
104}
105
106static void xrmdir(const char *path)
107{
108 path = get_mtime_path(path);
109 if (rmdir(path))
110 die_errno(_("failed to delete directory %s"), path);
111}
112
113static void avoid_racy(void)
114{
115 /*
116 * not use if we could usleep(10) if USE_NSEC is defined. The
117 * field nsec could be there, but the OS could choose to
118 * ignore it?
119 */
120 sleep(1);
121}
122
123static int test_if_untracked_cache_is_supported(void)
124{
125 struct stat st;
126 struct stat_data base;
127 int fd, ret = 0;
c105f563 128 char *cwd;
f64cb88d
NTND
129
130 strbuf_addstr(&mtime_dir, "mtime-test-XXXXXX");
131 if (!mkdtemp(mtime_dir.buf))
132 die_errno("Could not make temporary directory");
133
c105f563
CC
134 cwd = xgetcwd();
135 fprintf(stderr, _("Testing mtime in '%s' "), cwd);
136 free(cwd);
137
f64cb88d
NTND
138 atexit(remove_test_directory);
139 xstat_mtime_dir(&st);
140 fill_stat_data(&base, &st);
141 fputc('.', stderr);
142
143 avoid_racy();
144 fd = create_file("newfile");
145 xstat_mtime_dir(&st);
146 if (!match_stat_data(&base, &st)) {
147 close(fd);
148 fputc('\n', stderr);
149 fprintf_ln(stderr,_("directory stat info does not "
150 "change after adding a new file"));
151 goto done;
152 }
153 fill_stat_data(&base, &st);
154 fputc('.', stderr);
155
156 avoid_racy();
157 xmkdir("new-dir");
158 xstat_mtime_dir(&st);
159 if (!match_stat_data(&base, &st)) {
160 close(fd);
161 fputc('\n', stderr);
162 fprintf_ln(stderr, _("directory stat info does not change "
163 "after adding a new directory"));
164 goto done;
165 }
166 fill_stat_data(&base, &st);
167 fputc('.', stderr);
168
169 avoid_racy();
170 write_or_die(fd, "data", 4);
171 close(fd);
172 xstat_mtime_dir(&st);
173 if (match_stat_data(&base, &st)) {
174 fputc('\n', stderr);
175 fprintf_ln(stderr, _("directory stat info changes "
176 "after updating a file"));
177 goto done;
178 }
179 fputc('.', stderr);
180
181 avoid_racy();
182 close(create_file("new-dir/new"));
183 xstat_mtime_dir(&st);
184 if (match_stat_data(&base, &st)) {
185 fputc('\n', stderr);
186 fprintf_ln(stderr, _("directory stat info changes after "
187 "adding a file inside subdirectory"));
188 goto done;
189 }
190 fputc('.', stderr);
191
192 avoid_racy();
193 xunlink("newfile");
194 xstat_mtime_dir(&st);
195 if (!match_stat_data(&base, &st)) {
196 fputc('\n', stderr);
197 fprintf_ln(stderr, _("directory stat info does not "
198 "change after deleting a file"));
199 goto done;
200 }
201 fill_stat_data(&base, &st);
202 fputc('.', stderr);
203
204 avoid_racy();
205 xunlink("new-dir/new");
206 xrmdir("new-dir");
207 xstat_mtime_dir(&st);
208 if (!match_stat_data(&base, &st)) {
209 fputc('\n', stderr);
210 fprintf_ln(stderr, _("directory stat info does not "
211 "change after deleting a directory"));
212 goto done;
213 }
214
215 if (rmdir(mtime_dir.buf))
216 die_errno(_("failed to delete directory %s"), mtime_dir.buf);
217 fprintf_ln(stderr, _(" OK"));
218 ret = 1;
219
220done:
221 strbuf_release(&mtime_dir);
222 return ret;
223}
224
83b327ba 225static int mark_ce_flags(const char *path, int flag, int mark)
5f73076c
JH
226{
227 int namelen = strlen(path);
228 int pos = cache_name_pos(path, namelen);
229 if (0 <= pos) {
83b327ba
NTND
230 if (mark)
231 active_cache[pos]->ce_flags |= flag;
232 else
233 active_cache[pos]->ce_flags &= ~flag;
078a58e8 234 active_cache[pos]->ce_flags |= CE_UPDATE_IN_BASE;
a5400efe 235 cache_tree_invalidate_path(&the_index, path);
782a5ff9 236 active_cache_changed |= CE_ENTRY_CHANGED;
5f73076c
JH
237 return 0;
238 }
239 return -1;
240}
241
e011054b 242static int remove_one_path(const char *path)
e83c5163 243{
e011054b
LT
244 if (!allow_remove)
245 return error("%s: does not exist and --remove not passed", path);
246 if (remove_file_from_cache(path))
247 return error("%s: cannot remove from the index", path);
248 return 0;
249}
a6e5642f 250
e011054b
LT
251/*
252 * Handle a path that couldn't be lstat'ed. It's either:
253 * - missing file (ENOENT or ENOTDIR). That's ok if we're
254 * supposed to be removing it and the removal actually
255 * succeeds.
256 * - permission error. That's never ok.
257 */
258static int process_lstat_error(const char *path, int err)
259{
260 if (err == ENOENT || err == ENOTDIR)
261 return remove_one_path(path);
23d05364 262 return error("lstat(\"%s\"): %s", path, strerror(err));
e011054b 263}
a6e5642f 264
9c5e6c80 265static int add_one_path(const struct cache_entry *old, const char *path, int len, struct stat *st)
e011054b 266{
22631473
LT
267 int option, size;
268 struct cache_entry *ce;
3e09cdfd 269
22631473
LT
270 /* Was the old index entry already up-to-date? */
271 if (old && !ce_stage(old) && !ce_match_stat(old, st, 0))
272 return 0;
273
274 size = cache_entry_size(len);
275 ce = xcalloc(1, size);
e011054b 276 memcpy(ce->name, path, len);
b60e188c
TG
277 ce->ce_flags = create_ce_flags(0);
278 ce->ce_namelen = len;
e011054b
LT
279 fill_stat_cache_info(ce, st);
280 ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
ec1fcc16 281
99d1a986 282 if (index_path(ce->oid.hash, path, st,
dc4cd767
JM
283 info_only ? 0 : HASH_WRITE_OBJECT)) {
284 free(ce);
ec1fcc16 285 return -1;
dc4cd767 286 }
192268c1
JH
287 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
288 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
34143b26 289 if (add_cache_entry(ce, option))
e011054b 290 return error("%s: cannot add to the index - missing --add option?", path);
34143b26 291 return 0;
121481ab
LT
292}
293
e011054b
LT
294/*
295 * Handle a path that was a directory. Four cases:
296 *
297 * - it's already a gitlink in the index, and we keep it that
298 * way, and update it if we can (if we cannot find the HEAD,
299 * we're going to keep it unchanged in the index!)
300 *
301 * - it's a *file* in the index, in which case it should be
302 * removed as a file if removal is allowed, since it doesn't
303 * exist as such any more. If removal isn't allowed, it's
304 * an error.
305 *
306 * (NOTE! This is old and arguably fairly strange behaviour.
307 * We might want to make this an error unconditionally, and
308 * use "--force-remove" if you actually want to force removal).
309 *
310 * - it used to exist as a subdirectory (ie multiple files with
311 * this particular prefix) in the index, in which case it's wrong
312 * to try to update it as a directory.
313 *
314 * - it doesn't exist at all in the index, but it is a valid
315 * git directory, and it should be *added* as a gitlink.
316 */
317static int process_directory(const char *path, int len, struct stat *st)
318{
71445a0f 319 struct object_id oid;
e011054b
LT
320 int pos = cache_name_pos(path, len);
321
322 /* Exact match: file or existing gitlink */
323 if (pos >= 0) {
9c5e6c80 324 const struct cache_entry *ce = active_cache[pos];
7a51ed66 325 if (S_ISGITLINK(ce->ce_mode)) {
e011054b
LT
326
327 /* Do nothing to the index if there is no HEAD! */
71445a0f 328 if (resolve_gitlink_ref(path, "HEAD", oid.hash) < 0)
e011054b
LT
329 return 0;
330
331 return add_one_path(ce, path, len, st);
332 }
333 /* Should this be an unconditional error? */
334 return remove_one_path(path);
335 }
336
337 /* Inexact match: is there perhaps a subdirectory match? */
338 pos = -pos-1;
339 while (pos < active_nr) {
9c5e6c80 340 const struct cache_entry *ce = active_cache[pos++];
e011054b
LT
341
342 if (strncmp(ce->name, path, len))
343 break;
344 if (ce->name[len] > '/')
345 break;
346 if (ce->name[len] < '/')
347 continue;
348
349 /* Subdirectory match - error out */
350 return error("%s: is a directory - add individual files instead", path);
351 }
352
353 /* No match - should we add it as a gitlink? */
71445a0f 354 if (!resolve_gitlink_ref(path, "HEAD", oid.hash))
e011054b
LT
355 return add_one_path(NULL, path, len, st);
356
357 /* Error out. */
358 return error("%s: is a directory - add files inside instead", path);
359}
360
e011054b
LT
361static int process_path(const char *path)
362{
b4d1690d 363 int pos, len;
e011054b 364 struct stat st;
9c5e6c80 365 const struct cache_entry *ce;
e011054b 366
806d13b1 367 len = strlen(path);
57199892 368 if (has_symlink_leading_path(path, len))
806d13b1
JH
369 return error("'%s' is beyond a symbolic link", path);
370
b4d1690d
NTND
371 pos = cache_name_pos(path, len);
372 ce = pos < 0 ? NULL : active_cache[pos];
373 if (ce && ce_skip_worktree(ce)) {
374 /*
375 * working directory version is assumed "good"
376 * so updating it does not make sense.
377 * On the other hand, removing it from index should work
378 */
379 if (allow_remove && remove_file_from_cache(path))
380 return error("%s: cannot remove from the index", path);
381 return 0;
382 }
383
e011054b
LT
384 /*
385 * First things first: get the stat information, to decide
386 * what to do about the pathname!
387 */
388 if (lstat(path, &st) < 0)
389 return process_lstat_error(path, errno);
390
e011054b
LT
391 if (S_ISDIR(st.st_mode))
392 return process_directory(path, len, &st);
393
b4d1690d 394 return add_one_path(ce, path, len, &st);
e011054b
LT
395}
396
71445a0f 397static int add_cacheinfo(unsigned int mode, const struct object_id *oid,
d23748a6 398 const char *path, int stage)
9945d980 399{
192268c1 400 int size, len, option;
9945d980
LT
401 struct cache_entry *ce;
402
d23748a6 403 if (!verify_path(path))
7e7abea9 404 return error("Invalid path '%s'", path);
9945d980 405
d23748a6 406 len = strlen(path);
9945d980 407 size = cache_entry_size(len);
90321c10 408 ce = xcalloc(1, size);
9945d980 409
71445a0f 410 oidcpy(&ce->oid, oid);
d23748a6 411 memcpy(ce->name, path, len);
b60e188c
TG
412 ce->ce_flags = create_ce_flags(stage);
413 ce->ce_namelen = len;
e4479470 414 ce->ce_mode = create_ce_mode(mode);
5f73076c 415 if (assume_unchanged)
7a51ed66 416 ce->ce_flags |= CE_VALID;
192268c1
JH
417 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
418 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
caf4f582
JH
419 if (add_cache_entry(ce, option))
420 return error("%s: cannot add to the index - missing --add option?",
d23748a6
JH
421 path);
422 report("add '%s'", path);
caf4f582 423 return 0;
9945d980
LT
424}
425
22433ce4 426static void chmod_path(char flip, const char *path)
3e09cdfd
JH
427{
428 int pos;
429 struct cache_entry *ce;
f2a19340 430
3e09cdfd
JH
431 pos = cache_name_pos(path, strlen(path));
432 if (pos < 0)
227bdb18 433 goto fail;
3e09cdfd 434 ce = active_cache[pos];
d9d70966 435 if (chmod_cache_entry(ce, flip) < 0)
227bdb18 436 goto fail;
d9d70966 437
227bdb18
AR
438 report("chmod %cx '%s'", flip, path);
439 return;
440 fail:
7e44c935 441 die("git update-index: cannot chmod %cx '%s'", flip, path);
3e09cdfd
JH
442}
443
6bb69077 444static void update_one(const char *path)
ee1bec3d 445{
6bb69077 446 if (!verify_path(path)) {
ee1bec3d 447 fprintf(stderr, "Ignoring path %s\n", path);
6bb69077 448 return;
ee1bec3d 449 }
5f73076c 450 if (mark_valid_only) {
6bb69077 451 if (mark_ce_flags(path, CE_VALID, mark_valid_only == MARK_FLAG))
5f73076c 452 die("Unable to mark file %s", path);
6bb69077 453 return;
5f73076c 454 }
44a36913 455 if (mark_skip_worktree_only) {
6bb69077 456 if (mark_ce_flags(path, CE_SKIP_WORKTREE, mark_skip_worktree_only == MARK_FLAG))
5f73076c 457 die("Unable to mark file %s", path);
6bb69077 458 return;
5f73076c
JH
459 }
460
ee1bec3d 461 if (force_remove) {
6bb69077 462 if (remove_file_from_cache(path))
7e44c935 463 die("git update-index: unable to remove %s", path);
caf4f582 464 report("remove '%s'", path);
6bb69077 465 return;
ee1bec3d 466 }
6bb69077 467 if (process_path(path))
e011054b 468 die("Unable to process path %s", path);
caf4f582 469 report("add '%s'", path);
ee1bec3d
JH
470}
471
7e07ed84 472static void read_index_info(int nul_term_line)
d4dbf36d 473{
f285a2d7
BC
474 struct strbuf buf = STRBUF_INIT;
475 struct strbuf uq = STRBUF_INIT;
7e07ed84 476 strbuf_getline_fn getline_fn;
7fb1011e 477
7e07ed84
JH
478 getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
479 while (getline_fn(&buf, stdin) != EOF) {
9c20a470 480 char *ptr, *tab;
973d6a20 481 char *path_name;
71445a0f 482 struct object_id oid;
d4dbf36d 483 unsigned int mode;
6aead43d 484 unsigned long ul;
d23748a6
JH
485 int stage;
486
487 /* This reads lines formatted in one of three formats:
488 *
489 * (1) mode SP sha1 TAB path
f18d244a 490 * The first format is what "git apply --index-info"
d23748a6
JH
491 * reports, and used to reconstruct a partial tree
492 * that is used for phony merge base tree when falling
493 * back on 3-way merge.
494 *
495 * (2) mode SP type SP sha1 TAB path
f18d244a 496 * The second format is to stuff "git ls-tree" output
d23748a6 497 * into the index file.
fefe81c9 498 *
d23748a6
JH
499 * (3) mode SP sha1 SP stage TAB path
500 * This format is to put higher order stages into the
f18d244a 501 * index file and matches "git ls-files --stage" output.
d23748a6 502 */
6aead43d
JM
503 errno = 0;
504 ul = strtoul(buf.buf, &ptr, 8);
505 if (ptr == buf.buf || *ptr != ' '
506 || errno || (unsigned int) ul != ul)
d4dbf36d 507 goto bad_line;
6aead43d 508 mode = ul;
d4dbf36d 509
9c20a470 510 tab = strchr(ptr, '\t');
71445a0f 511 if (!tab || tab - ptr < GIT_SHA1_HEXSZ + 1)
9c20a470 512 goto bad_line;
d23748a6 513
2d497115 514 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
d23748a6
JH
515 stage = tab[-1] - '0';
516 ptr = tab + 1; /* point at the head of path */
517 tab = tab - 2; /* point at tail of sha1 */
518 }
519 else {
520 stage = 0;
521 ptr = tab + 1; /* point at the head of path */
522 }
523
71445a0f 524 if (get_oid_hex(tab - GIT_SHA1_HEXSZ, &oid) ||
525 tab[-(GIT_SHA1_HEXSZ + 1)] != ' ')
9c20a470 526 goto bad_line;
973d6a20 527
7fb1011e 528 path_name = ptr;
7e07ed84 529 if (!nul_term_line && path_name[0] == '"') {
7fb1011e
PH
530 strbuf_reset(&uq);
531 if (unquote_c_style(&uq, path_name, NULL)) {
7e44c935 532 die("git update-index: bad quoting of path name");
7fb1011e
PH
533 }
534 path_name = uq.buf;
535 }
973d6a20
JH
536
537 if (!verify_path(path_name)) {
538 fprintf(stderr, "Ignoring path %s\n", path_name);
d4dbf36d
JH
539 continue;
540 }
541
542 if (!mode) {
543 /* mode == 0 means there is no such path -- remove */
973d6a20 544 if (remove_file_from_cache(path_name))
7e44c935 545 die("git update-index: unable to remove %s",
d4dbf36d
JH
546 ptr);
547 }
548 else {
549 /* mode ' ' sha1 '\t' name
550 * ptr[-1] points at tab,
551 * ptr[-41] is at the beginning of sha1
552 */
71445a0f 553 ptr[-(GIT_SHA1_HEXSZ + 2)] = ptr[-1] = 0;
554 if (add_cacheinfo(mode, &oid, path_name, stage))
7e44c935 555 die("git update-index: unable to update %s",
973d6a20 556 path_name);
d4dbf36d
JH
557 }
558 continue;
559
560 bad_line:
561 die("malformed index info %s", buf.buf);
562 }
e6c019d0 563 strbuf_release(&buf);
7fb1011e 564 strbuf_release(&uq);
d4dbf36d
JH
565}
566
309be813 567static const char * const update_index_usage[] = {
9c9b4f2f 568 N_("git update-index [<options>] [--] [<file>...]"),
309be813
JN
569 NULL
570};
f6ab5bb2 571
71445a0f 572static struct object_id head_oid;
573static struct object_id merge_head_oid;
2bd452d3
JH
574
575static struct cache_entry *read_one_ent(const char *which,
71445a0f 576 struct object_id *ent, const char *path,
2bd452d3
JH
577 int namelen, int stage)
578{
579 unsigned mode;
71445a0f 580 struct object_id oid;
2bd452d3
JH
581 int size;
582 struct cache_entry *ce;
583
71445a0f 584 if (get_tree_entry(ent->hash, path, oid.hash, &mode)) {
83e77a25
JH
585 if (which)
586 error("%s: not in %s branch.", path, which);
2bd452d3
JH
587 return NULL;
588 }
589 if (mode == S_IFDIR) {
83e77a25
JH
590 if (which)
591 error("%s: not a blob in %s branch.", path, which);
2bd452d3
JH
592 return NULL;
593 }
594 size = cache_entry_size(namelen);
595 ce = xcalloc(1, size);
596
71445a0f 597 oidcpy(&ce->oid, &oid);
2bd452d3 598 memcpy(ce->name, path, namelen);
b60e188c
TG
599 ce->ce_flags = create_ce_flags(stage);
600 ce->ce_namelen = namelen;
2bd452d3
JH
601 ce->ce_mode = create_ce_mode(mode);
602 return ce;
603}
604
605static int unresolve_one(const char *path)
606{
607 int namelen = strlen(path);
608 int pos;
609 int ret = 0;
610 struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
611
612 /* See if there is such entry in the index. */
613 pos = cache_name_pos(path, namelen);
8aa38563
JH
614 if (0 <= pos) {
615 /* already merged */
616 pos = unmerge_cache_entry_at(pos);
617 if (pos < active_nr) {
9c5e6c80 618 const struct cache_entry *ce = active_cache[pos];
8aa38563
JH
619 if (ce_stage(ce) &&
620 ce_namelen(ce) == namelen &&
621 !memcmp(ce->name, path, namelen))
622 return 0;
623 }
624 /* no resolve-undo information; fall back */
625 } else {
2bd452d3
JH
626 /* If there isn't, either it is unmerged, or
627 * resolved as "removed" by mistake. We do not
628 * want to do anything in the former case.
629 */
630 pos = -pos-1;
631 if (pos < active_nr) {
9c5e6c80 632 const struct cache_entry *ce = active_cache[pos];
2bd452d3
JH
633 if (ce_namelen(ce) == namelen &&
634 !memcmp(ce->name, path, namelen)) {
635 fprintf(stderr,
636 "%s: skipping still unmerged path.\n",
637 path);
638 goto free_return;
639 }
640 }
641 }
642
643 /* Grab blobs from given path from HEAD and MERGE_HEAD,
644 * stuff HEAD version in stage #2,
645 * stuff MERGE_HEAD version in stage #3.
646 */
71445a0f 647 ce_2 = read_one_ent("our", &head_oid, path, namelen, 2);
648 ce_3 = read_one_ent("their", &merge_head_oid, path, namelen, 3);
2bd452d3
JH
649
650 if (!ce_2 || !ce_3) {
651 ret = -1;
652 goto free_return;
653 }
99d1a986 654 if (!oidcmp(&ce_2->oid, &ce_3->oid) &&
2bd452d3
JH
655 ce_2->ce_mode == ce_3->ce_mode) {
656 fprintf(stderr, "%s: identical in both, skipping.\n",
657 path);
658 goto free_return;
659 }
660
661 remove_file_from_cache(path);
662 if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
663 error("%s: cannot add our version to the index.", path);
664 ret = -1;
665 goto free_return;
666 }
667 if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
668 return 0;
669 error("%s: cannot add their version to the index.", path);
670 ret = -1;
671 free_return:
672 free(ce_2);
673 free(ce_3);
674 return ret;
675}
676
677static void read_head_pointers(void)
678{
71445a0f 679 if (read_ref("HEAD", head_oid.hash))
d7530708 680 die("No HEAD -- no initial commit yet?");
71445a0f 681 if (read_ref("MERGE_HEAD", merge_head_oid.hash)) {
2bd452d3
JH
682 fprintf(stderr, "Not in the middle of a merge.\n");
683 exit(0);
684 }
685}
686
09895c1f
JH
687static int do_unresolve(int ac, const char **av,
688 const char *prefix, int prefix_length)
2bd452d3
JH
689{
690 int i;
691 int err = 0;
692
693 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
694 * are not doing a merge, so exit with success status.
695 */
696 read_head_pointers();
697
698 for (i = 1; i < ac; i++) {
699 const char *arg = av[i];
d7a643b7 700 char *p = prefix_path(prefix, prefix_length, arg);
09895c1f 701 err |= unresolve_one(p);
d7a643b7 702 free(p);
2bd452d3
JH
703 }
704 return err;
705}
706
83e77a25
JH
707static int do_reupdate(int ac, const char **av,
708 const char *prefix, int prefix_length)
709{
710 /* Read HEAD and run update-index on paths that are
711 * merged and already different between index and HEAD.
712 */
713 int pos;
714 int has_head = 1;
eb9cb55b
NTND
715 struct pathspec pathspec;
716
0fdc2ae5
NTND
717 parse_pathspec(&pathspec, 0,
718 PATHSPEC_PREFER_CWD,
719 prefix, av + 1);
83e77a25 720
71445a0f 721 if (read_ref("HEAD", head_oid.hash))
83e77a25
JH
722 /* If there is no HEAD, that means it is an initial
723 * commit. Update everything in the index.
724 */
725 has_head = 0;
726 redo:
727 for (pos = 0; pos < active_nr; pos++) {
9c5e6c80 728 const struct cache_entry *ce = active_cache[pos];
83e77a25
JH
729 struct cache_entry *old = NULL;
730 int save_nr;
5699d17e 731 char *path;
22293b9c 732
429bb40a 733 if (ce_stage(ce) || !ce_path_match(ce, &pathspec, NULL))
83e77a25
JH
734 continue;
735 if (has_head)
71445a0f 736 old = read_one_ent(NULL, &head_oid,
83e77a25
JH
737 ce->name, ce_namelen(ce), 0);
738 if (old && ce->ce_mode == old->ce_mode &&
99d1a986 739 !oidcmp(&ce->oid, &old->oid)) {
83e77a25
JH
740 free(old);
741 continue; /* unchanged */
742 }
743 /* Be careful. The working tree may not have the
744 * path anymore, in which case, under 'allow_remove',
745 * or worse yet 'allow_replace', active_nr may decrease.
746 */
747 save_nr = active_nr;
5699d17e
KB
748 path = xstrdup(ce->name);
749 update_one(path);
750 free(path);
1b7cb896 751 free(old);
83e77a25
JH
752 if (save_nr != active_nr)
753 goto redo;
754 }
ed6e8038 755 clear_pathspec(&pathspec);
83e77a25
JH
756 return 0;
757}
758
309be813
JN
759struct refresh_params {
760 unsigned int flags;
761 int *has_errors;
762};
763
764static int refresh(struct refresh_params *o, unsigned int flag)
765{
766 setup_work_tree();
7349afd2 767 read_cache_preload(NULL);
309be813
JN
768 *o->has_errors |= refresh_cache(o->flags | flag);
769 return 0;
770}
771
772static int refresh_callback(const struct option *opt,
773 const char *arg, int unset)
774{
775 return refresh(opt->value, 0);
776}
777
778static int really_refresh_callback(const struct option *opt,
779 const char *arg, int unset)
780{
781 return refresh(opt->value, REFRESH_REALLY);
782}
783
784static int chmod_callback(const struct option *opt,
785 const char *arg, int unset)
786{
787 char *flip = opt->value;
788 if ((arg[0] != '-' && arg[0] != '+') || arg[1] != 'x' || arg[2])
789 return error("option 'chmod' expects \"+x\" or \"-x\"");
790 *flip = arg[0];
791 return 0;
792}
793
794static int resolve_undo_clear_callback(const struct option *opt,
795 const char *arg, int unset)
796{
797 resolve_undo_clear();
798 return 0;
799}
800
ec160ae1
JH
801static int parse_new_style_cacheinfo(const char *arg,
802 unsigned int *mode,
71445a0f 803 struct object_id *oid,
ec160ae1
JH
804 const char **path)
805{
806 unsigned long ul;
807 char *endp;
808
c8e1ee4f
JK
809 if (!arg)
810 return -1;
811
ec160ae1
JH
812 errno = 0;
813 ul = strtoul(arg, &endp, 8);
814 if (errno || endp == arg || *endp != ',' || (unsigned int) ul != ul)
815 return -1; /* not a new-style cacheinfo */
816 *mode = ul;
817 endp++;
71445a0f 818 if (get_oid_hex(endp, oid) || endp[GIT_SHA1_HEXSZ] != ',')
ec160ae1 819 return -1;
71445a0f 820 *path = endp + GIT_SHA1_HEXSZ + 1;
ec160ae1
JH
821 return 0;
822}
823
309be813
JN
824static int cacheinfo_callback(struct parse_opt_ctx_t *ctx,
825 const struct option *opt, int unset)
826{
71445a0f 827 struct object_id oid;
309be813 828 unsigned int mode;
ec160ae1 829 const char *path;
309be813 830
71445a0f 831 if (!parse_new_style_cacheinfo(ctx->argv[1], &mode, &oid, &path)) {
832 if (add_cacheinfo(mode, &oid, path, 0))
ec160ae1
JH
833 die("git update-index: --cacheinfo cannot add %s", path);
834 ctx->argv++;
835 ctx->argc--;
836 return 0;
837 }
309be813 838 if (ctx->argc <= 3)
ec160ae1 839 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
309be813 840 if (strtoul_ui(*++ctx->argv, 8, &mode) ||
71445a0f 841 get_oid_hex(*++ctx->argv, &oid) ||
842 add_cacheinfo(mode, &oid, *++ctx->argv, 0))
309be813
JN
843 die("git update-index: --cacheinfo cannot add %s", *ctx->argv);
844 ctx->argc -= 3;
845 return 0;
846}
847
848static int stdin_cacheinfo_callback(struct parse_opt_ctx_t *ctx,
849 const struct option *opt, int unset)
850{
7e07ed84 851 int *nul_term_line = opt->value;
309be813
JN
852
853 if (ctx->argc != 1)
854 return error("option '%s' must be the last argument", opt->long_name);
855 allow_add = allow_replace = allow_remove = 1;
7e07ed84 856 read_index_info(*nul_term_line);
309be813
JN
857 return 0;
858}
859
860static int stdin_callback(struct parse_opt_ctx_t *ctx,
861 const struct option *opt, int unset)
862{
863 int *read_from_stdin = opt->value;
864
865 if (ctx->argc != 1)
866 return error("option '%s' must be the last argument", opt->long_name);
867 *read_from_stdin = 1;
868 return 0;
869}
870
871static int unresolve_callback(struct parse_opt_ctx_t *ctx,
872 const struct option *opt, int flags)
873{
874 int *has_errors = opt->value;
875 const char *prefix = startup_info->prefix;
876
877 /* consume remaining arguments. */
878 *has_errors = do_unresolve(ctx->argc, ctx->argv,
879 prefix, prefix ? strlen(prefix) : 0);
880 if (*has_errors)
881 active_cache_changed = 0;
882
883 ctx->argv += ctx->argc - 1;
884 ctx->argc = 1;
885 return 0;
886}
887
888static int reupdate_callback(struct parse_opt_ctx_t *ctx,
889 const struct option *opt, int flags)
890{
891 int *has_errors = opt->value;
892 const char *prefix = startup_info->prefix;
893
894 /* consume remaining arguments. */
895 setup_work_tree();
896 *has_errors = do_reupdate(ctx->argc, ctx->argv,
897 prefix, prefix ? strlen(prefix) : 0);
898 if (*has_errors)
899 active_cache_changed = 0;
900
901 ctx->argv += ctx->argc - 1;
902 ctx->argc = 1;
903 return 0;
904}
905
a633fca0 906int cmd_update_index(int argc, const char **argv, const char *prefix)
e83c5163 907{
7e07ed84 908 int newfd, entries, has_errors = 0, nul_term_line = 0;
113e6413 909 enum uc_mode untracked_cache = UC_UNSPECIFIED;
ee1bec3d 910 int read_from_stdin = 0;
ee1bec3d 911 int prefix_length = prefix ? strlen(prefix) : 0;
69dec66b 912 int preferred_index_format = 0;
227bdb18 913 char set_executable_bit = 0;
309be813 914 struct refresh_params refresh_args = {0, &has_errors};
7b802b86 915 int lock_error = 0;
c18b80a0 916 int split_index = -1;
fefe81c9 917 struct lock_file *lock_file;
309be813 918 struct parse_opt_ctx_t ctx;
7e07ed84 919 strbuf_getline_fn getline_fn;
309be813
JN
920 int parseopt_state = PARSE_OPT_UNKNOWN;
921 struct option options[] = {
922 OPT_BIT('q', NULL, &refresh_args.flags,
4a4838b4 923 N_("continue refresh even when index needs update"),
309be813
JN
924 REFRESH_QUIET),
925 OPT_BIT(0, "ignore-submodules", &refresh_args.flags,
4a4838b4 926 N_("refresh: ignore submodules"),
309be813
JN
927 REFRESH_IGNORE_SUBMODULES),
928 OPT_SET_INT(0, "add", &allow_add,
4a4838b4 929 N_("do not ignore new files"), 1),
309be813 930 OPT_SET_INT(0, "replace", &allow_replace,
4a4838b4 931 N_("let files replace directories and vice-versa"), 1),
309be813 932 OPT_SET_INT(0, "remove", &allow_remove,
4a4838b4 933 N_("notice files missing from worktree"), 1),
309be813 934 OPT_BIT(0, "unmerged", &refresh_args.flags,
4a4838b4 935 N_("refresh even if index contains unmerged entries"),
309be813
JN
936 REFRESH_UNMERGED),
937 {OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL,
4a4838b4 938 N_("refresh stat information"),
309be813
JN
939 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
940 refresh_callback},
941 {OPTION_CALLBACK, 0, "really-refresh", &refresh_args, NULL,
4a4838b4 942 N_("like --refresh, but ignore assume-unchanged setting"),
309be813
JN
943 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
944 really_refresh_callback},
945 {OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
ec160ae1 946 N_("<mode>,<object>,<path>"),
4a4838b4 947 N_("add the specified entry to the index"),
ec160ae1 948 PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
309be813
JN
949 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
950 (parse_opt_cb *) cacheinfo_callback},
4a4838b4
NTND
951 {OPTION_CALLBACK, 0, "chmod", &set_executable_bit, N_("(+/-)x"),
952 N_("override the executable bit of the listed files"),
309be813
JN
953 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
954 chmod_callback},
955 {OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
4a4838b4 956 N_("mark files as \"not changing\""),
309be813
JN
957 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
958 {OPTION_SET_INT, 0, "no-assume-unchanged", &mark_valid_only, NULL,
4a4838b4 959 N_("clear assumed-unchanged bit"),
309be813
JN
960 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
961 {OPTION_SET_INT, 0, "skip-worktree", &mark_skip_worktree_only, NULL,
4a4838b4 962 N_("mark files as \"index-only\""),
309be813
JN
963 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
964 {OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
4a4838b4 965 N_("clear skip-worktree bit"),
309be813
JN
966 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
967 OPT_SET_INT(0, "info-only", &info_only,
4a4838b4 968 N_("add to index only; do not add content to object database"), 1),
309be813 969 OPT_SET_INT(0, "force-remove", &force_remove,
4a4838b4 970 N_("remove named paths even if present in worktree"), 1),
7e07ed84
JH
971 OPT_BOOL('z', NULL, &nul_term_line,
972 N_("with --stdin: input lines are terminated by null bytes")),
309be813 973 {OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
4a4838b4 974 N_("read list of paths to be updated from standard input"),
309be813
JN
975 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
976 (parse_opt_cb *) stdin_callback},
7e07ed84 977 {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &nul_term_line, NULL,
4a4838b4 978 N_("add entries from standard input to the index"),
309be813
JN
979 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
980 (parse_opt_cb *) stdin_cacheinfo_callback},
981 {OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
4a4838b4 982 N_("repopulate stages #2 and #3 for the listed paths"),
309be813
JN
983 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
984 (parse_opt_cb *) unresolve_callback},
985 {OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
4a4838b4 986 N_("only update entries that differ from HEAD"),
309be813
JN
987 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
988 (parse_opt_cb *) reupdate_callback},
989 OPT_BIT(0, "ignore-missing", &refresh_args.flags,
4a4838b4 990 N_("ignore files missing from worktree"),
309be813
JN
991 REFRESH_IGNORE_MISSING),
992 OPT_SET_INT(0, "verbose", &verbose,
4a4838b4 993 N_("report actions to standard output"), 1),
309be813 994 {OPTION_CALLBACK, 0, "clear-resolve-undo", NULL, NULL,
4a4838b4 995 N_("(for porcelains) forget saved unresolved conflicts"),
309be813
JN
996 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
997 resolve_undo_clear_callback},
69dec66b 998 OPT_INTEGER(0, "index-version", &preferred_index_format,
4a4838b4 999 N_("write index in this format")),
c18b80a0
NTND
1000 OPT_BOOL(0, "split-index", &split_index,
1001 N_("enable or disable split index")),
9e597241
NTND
1002 OPT_BOOL(0, "untracked-cache", &untracked_cache,
1003 N_("enable/disable untracked cache")),
eaab83d0
CC
1004 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache,
1005 N_("test if the filesystem supports untracked cache"), UC_TEST),
f64cb88d 1006 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache,
113e6413 1007 N_("enable untracked cache without testing the filesystem"), UC_FORCE),
309be813
JN
1008 OPT_END()
1009 };
bb233d69 1010
9c7c27ee 1011 if (argc == 2 && !strcmp(argv[1], "-h"))
b04d930b 1012 usage_with_options(update_index_usage, options);
9c7c27ee 1013
ef90d6d4 1014 git_config(git_default_config, NULL);
3e09cdfd 1015
fefe81c9 1016 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
928e47e3 1017 lock_file = xcalloc(1, sizeof(struct lock_file));
fefe81c9 1018
b3e83cc7 1019 /* we will diagnose later if it turns out that we need to update it */
30ca07a2 1020 newfd = hold_locked_index(lock_file, 0);
7b802b86
JH
1021 if (newfd < 0)
1022 lock_error = errno;
9614b8dc 1023
e83c5163 1024 entries = read_cache();
9614b8dc 1025 if (entries < 0)
2de381f9 1026 die("cache corrupted");
e83c5163 1027
309be813
JN
1028 /*
1029 * Custom copy of parse_options() because we want to handle
1030 * filename arguments as they come.
1031 */
1032 parse_options_start(&ctx, argc, argv, prefix,
1033 options, PARSE_OPT_STOP_AT_NON_OPTION);
1034 while (ctx.argc) {
1035 if (parseopt_state != PARSE_OPT_DONE)
1036 parseopt_state = parse_options_step(&ctx, options,
1037 update_index_usage);
1038 if (!ctx.argc)
1039 break;
1040 switch (parseopt_state) {
1041 case PARSE_OPT_HELP:
1042 exit(129);
1043 case PARSE_OPT_NON_OPTION:
1044 case PARSE_OPT_DONE:
1045 {
1046 const char *path = ctx.argv[0];
d7a643b7 1047 char *p;
121481ab 1048
309be813
JN
1049 setup_work_tree();
1050 p = prefix_path(prefix, prefix_length, path);
6bb69077 1051 update_one(p);
309be813
JN
1052 if (set_executable_bit)
1053 chmod_path(set_executable_bit, p);
d7a643b7 1054 free(p);
309be813
JN
1055 ctx.argc--;
1056 ctx.argv++;
1057 break;
1058 }
1059 case PARSE_OPT_UNKNOWN:
1060 if (ctx.argv[0][1] == '-')
1061 error("unknown option '%s'", ctx.argv[0] + 2);
1062 else
1063 error("unknown switch '%c'", *ctx.opt);
1064 usage_with_options(update_index_usage, options);
121481ab 1065 }
ee1bec3d 1066 }
309be813 1067 argc = parse_options_end(&ctx);
7e07ed84
JH
1068
1069 getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
69dec66b
JH
1070 if (preferred_index_format) {
1071 if (preferred_index_format < INDEX_FORMAT_LB ||
1072 INDEX_FORMAT_UB < preferred_index_format)
1073 die("index-version %d not in range: %d..%d",
1074 preferred_index_format,
1075 INDEX_FORMAT_LB, INDEX_FORMAT_UB);
1076
1077 if (the_index.version != preferred_index_format)
782a5ff9 1078 active_cache_changed |= SOMETHING_CHANGED;
69dec66b
JH
1079 the_index.version = preferred_index_format;
1080 }
309be813 1081
ee1bec3d 1082 if (read_from_stdin) {
0d4cc1b4
JK
1083 struct strbuf buf = STRBUF_INIT;
1084 struct strbuf unquoted = STRBUF_INIT;
7fb1011e 1085
f83eafdd 1086 setup_work_tree();
7e07ed84 1087 while (getline_fn(&buf, stdin) != EOF) {
d7a643b7 1088 char *p;
7e07ed84 1089 if (!nul_term_line && buf.buf[0] == '"') {
0d4cc1b4
JK
1090 strbuf_reset(&unquoted);
1091 if (unquote_c_style(&unquoted, buf.buf, NULL))
7fb1011e 1092 die("line is badly quoted");
0d4cc1b4 1093 strbuf_swap(&buf, &unquoted);
7fb1011e
PH
1094 }
1095 p = prefix_path(prefix, prefix_length, buf.buf);
6bb69077 1096 update_one(p);
fb69a760 1097 if (set_executable_bit)
227bdb18 1098 chmod_path(set_executable_bit, p);
d7a643b7 1099 free(p);
9b63f501 1100 }
0d4cc1b4 1101 strbuf_release(&unquoted);
e6c019d0 1102 strbuf_release(&buf);
e83c5163 1103 }
2bd452d3 1104
c18b80a0 1105 if (split_index > 0) {
6cc10533
CC
1106 if (git_config_get_split_index() == 0)
1107 warning(_("core.splitIndex is set to false; "
1108 "remove or change it, if you really want to "
1109 "enable split index"));
cef4fc7e
CC
1110 if (the_index.split_index)
1111 the_index.cache_changed |= SPLIT_INDEX_ORDERED;
1112 else
1113 add_split_index(&the_index);
6cc10533
CC
1114 } else if (!split_index) {
1115 if (git_config_get_split_index() == 1)
1116 warning(_("core.splitIndex is set to true; "
1117 "remove or change it, if you really want to "
1118 "disable split index"));
cef4fc7e 1119 remove_split_index(&the_index);
6cc10533 1120 }
9e597241 1121
435ec090
CC
1122 switch (untracked_cache) {
1123 case UC_UNSPECIFIED:
1124 break;
1125 case UC_DISABLE:
1126 if (git_config_get_untracked_cache() == 1)
43073f89
VA
1127 warning(_("core.untrackedCache is set to true; "
1128 "remove or change it, if you really want to "
1129 "disable the untracked cache"));
07b29bfd 1130 remove_untracked_cache(&the_index);
6d19db14 1131 report(_("Untracked cache disabled"));
435ec090
CC
1132 break;
1133 case UC_TEST:
1134 setup_work_tree();
1135 return !test_if_untracked_cache_is_supported();
1136 case UC_ENABLE:
1137 case UC_FORCE:
1138 if (git_config_get_untracked_cache() == 0)
43073f89
VA
1139 warning(_("core.untrackedCache is set to false; "
1140 "remove or change it, if you really want to "
1141 "enable the untracked cache"));
435ec090
CC
1142 add_untracked_cache(&the_index);
1143 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1144 break;
1145 default:
ef1177d1 1146 die("BUG: bad untracked_cache value: %d", untracked_cache);
9e597241 1147 }
c18b80a0 1148
5cd5ace7 1149 if (active_cache_changed) {
7b802b86 1150 if (newfd < 0) {
309be813 1151 if (refresh_args.flags & REFRESH_QUIET)
7b802b86 1152 exit(128);
e197c218 1153 unable_to_lock_die(get_index_file(), lock_error);
7b802b86 1154 }
03b86647 1155 if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
021b6e45 1156 die("Unable to write new index file");
5cd5ace7 1157 }
9614b8dc 1158
fefe81c9
LS
1159 rollback_lock_file(lock_file);
1160
c4b83e61 1161 return has_errors ? 1 : 0;
e83c5163 1162}