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