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