]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/update-index.c
builtin/update-index: convert to using the_hash_algo
[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{
22631473
LT
271 int option, size;
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
278 size = cache_entry_size(len);
279 ce = xcalloc(1, size);
e011054b 280 memcpy(ce->name, path, len);
b60e188c
TG
281 ce->ce_flags = create_ce_flags(0);
282 ce->ce_namelen = len;
e011054b
LT
283 fill_stat_cache_info(ce, st);
284 ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
ec1fcc16 285
98e019b0 286 if (index_path(&ce->oid, path, st,
dc4cd767
JM
287 info_only ? 0 : HASH_WRITE_OBJECT)) {
288 free(ce);
ec1fcc16 289 return -1;
dc4cd767 290 }
192268c1
JH
291 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
292 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
baddc96b
JK
293 if (add_cache_entry(ce, option)) {
294 free(ce);
e011054b 295 return error("%s: cannot add to the index - missing --add option?", path);
baddc96b 296 }
34143b26 297 return 0;
121481ab
LT
298}
299
e011054b
LT
300/*
301 * Handle a path that was a directory. Four cases:
302 *
303 * - it's already a gitlink in the index, and we keep it that
304 * way, and update it if we can (if we cannot find the HEAD,
305 * we're going to keep it unchanged in the index!)
306 *
307 * - it's a *file* in the index, in which case it should be
308 * removed as a file if removal is allowed, since it doesn't
309 * exist as such any more. If removal isn't allowed, it's
310 * an error.
311 *
312 * (NOTE! This is old and arguably fairly strange behaviour.
313 * We might want to make this an error unconditionally, and
314 * use "--force-remove" if you actually want to force removal).
315 *
316 * - it used to exist as a subdirectory (ie multiple files with
317 * this particular prefix) in the index, in which case it's wrong
318 * to try to update it as a directory.
319 *
320 * - it doesn't exist at all in the index, but it is a valid
321 * git directory, and it should be *added* as a gitlink.
322 */
323static int process_directory(const char *path, int len, struct stat *st)
324{
71445a0f 325 struct object_id oid;
e011054b
LT
326 int pos = cache_name_pos(path, len);
327
328 /* Exact match: file or existing gitlink */
329 if (pos >= 0) {
9c5e6c80 330 const struct cache_entry *ce = active_cache[pos];
7a51ed66 331 if (S_ISGITLINK(ce->ce_mode)) {
e011054b
LT
332
333 /* Do nothing to the index if there is no HEAD! */
a98e6101 334 if (resolve_gitlink_ref(path, "HEAD", &oid) < 0)
e011054b
LT
335 return 0;
336
337 return add_one_path(ce, path, len, st);
338 }
339 /* Should this be an unconditional error? */
340 return remove_one_path(path);
341 }
342
343 /* Inexact match: is there perhaps a subdirectory match? */
344 pos = -pos-1;
345 while (pos < active_nr) {
9c5e6c80 346 const struct cache_entry *ce = active_cache[pos++];
e011054b
LT
347
348 if (strncmp(ce->name, path, len))
349 break;
350 if (ce->name[len] > '/')
351 break;
352 if (ce->name[len] < '/')
353 continue;
354
355 /* Subdirectory match - error out */
356 return error("%s: is a directory - add individual files instead", path);
357 }
358
359 /* No match - should we add it as a gitlink? */
a98e6101 360 if (!resolve_gitlink_ref(path, "HEAD", &oid))
e011054b
LT
361 return add_one_path(NULL, path, len, st);
362
363 /* Error out. */
364 return error("%s: is a directory - add files inside instead", path);
365}
366
eb12dd0c 367static int process_path(const char *path, struct stat *st, int stat_errno)
e011054b 368{
b4d1690d 369 int pos, len;
9c5e6c80 370 const struct cache_entry *ce;
e011054b 371
806d13b1 372 len = strlen(path);
57199892 373 if (has_symlink_leading_path(path, len))
806d13b1
JH
374 return error("'%s' is beyond a symbolic link", path);
375
b4d1690d
NTND
376 pos = cache_name_pos(path, len);
377 ce = pos < 0 ? NULL : active_cache[pos];
378 if (ce && ce_skip_worktree(ce)) {
379 /*
380 * working directory version is assumed "good"
381 * so updating it does not make sense.
382 * On the other hand, removing it from index should work
383 */
384 if (allow_remove && remove_file_from_cache(path))
385 return error("%s: cannot remove from the index", path);
386 return 0;
387 }
388
e011054b
LT
389 /*
390 * First things first: get the stat information, to decide
391 * what to do about the pathname!
392 */
eb12dd0c
JK
393 if (stat_errno)
394 return process_lstat_error(path, stat_errno);
e011054b 395
eb12dd0c
JK
396 if (S_ISDIR(st->st_mode))
397 return process_directory(path, len, st);
e011054b 398
eb12dd0c 399 return add_one_path(ce, path, len, st);
e011054b
LT
400}
401
71445a0f 402static int add_cacheinfo(unsigned int mode, const struct object_id *oid,
d23748a6 403 const char *path, int stage)
9945d980 404{
192268c1 405 int size, len, option;
9945d980
LT
406 struct cache_entry *ce;
407
10ecfa76 408 if (!verify_path(path, mode))
7e7abea9 409 return error("Invalid path '%s'", path);
9945d980 410
d23748a6 411 len = strlen(path);
9945d980 412 size = cache_entry_size(len);
90321c10 413 ce = xcalloc(1, size);
9945d980 414
71445a0f 415 oidcpy(&ce->oid, oid);
d23748a6 416 memcpy(ce->name, path, len);
b60e188c
TG
417 ce->ce_flags = create_ce_flags(stage);
418 ce->ce_namelen = len;
e4479470 419 ce->ce_mode = create_ce_mode(mode);
5f73076c 420 if (assume_unchanged)
7a51ed66 421 ce->ce_flags |= CE_VALID;
192268c1
JH
422 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
423 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
caf4f582
JH
424 if (add_cache_entry(ce, option))
425 return error("%s: cannot add to the index - missing --add option?",
d23748a6
JH
426 path);
427 report("add '%s'", path);
caf4f582 428 return 0;
9945d980
LT
429}
430
22433ce4 431static void chmod_path(char flip, const char *path)
3e09cdfd
JH
432{
433 int pos;
434 struct cache_entry *ce;
f2a19340 435
3e09cdfd
JH
436 pos = cache_name_pos(path, strlen(path));
437 if (pos < 0)
227bdb18 438 goto fail;
3e09cdfd 439 ce = active_cache[pos];
d9d70966 440 if (chmod_cache_entry(ce, flip) < 0)
227bdb18 441 goto fail;
d9d70966 442
227bdb18
AR
443 report("chmod %cx '%s'", flip, path);
444 return;
445 fail:
7e44c935 446 die("git update-index: cannot chmod %cx '%s'", flip, path);
3e09cdfd
JH
447}
448
6bb69077 449static void update_one(const char *path)
ee1bec3d 450{
eb12dd0c
JK
451 int stat_errno = 0;
452 struct stat st;
453
68f95b26
JH
454 if (mark_valid_only || mark_skip_worktree_only || force_remove ||
455 mark_fsmonitor_only)
eb12dd0c
JK
456 st.st_mode = 0;
457 else if (lstat(path, &st) < 0) {
458 st.st_mode = 0;
459 stat_errno = errno;
460 } /* else stat is valid */
461
10ecfa76 462 if (!verify_path(path, st.st_mode)) {
ee1bec3d 463 fprintf(stderr, "Ignoring path %s\n", path);
6bb69077 464 return;
ee1bec3d 465 }
5f73076c 466 if (mark_valid_only) {
6bb69077 467 if (mark_ce_flags(path, CE_VALID, mark_valid_only == MARK_FLAG))
5f73076c 468 die("Unable to mark file %s", path);
6bb69077 469 return;
5f73076c 470 }
44a36913 471 if (mark_skip_worktree_only) {
6bb69077 472 if (mark_ce_flags(path, CE_SKIP_WORKTREE, mark_skip_worktree_only == MARK_FLAG))
5f73076c 473 die("Unable to mark file %s", path);
6bb69077 474 return;
5f73076c 475 }
9d406cba
BP
476 if (mark_fsmonitor_only) {
477 if (mark_ce_flags(path, CE_FSMONITOR_VALID, mark_fsmonitor_only == MARK_FLAG))
478 die("Unable to mark file %s", path);
479 return;
480 }
5f73076c 481
ee1bec3d 482 if (force_remove) {
6bb69077 483 if (remove_file_from_cache(path))
7e44c935 484 die("git update-index: unable to remove %s", path);
caf4f582 485 report("remove '%s'", path);
6bb69077 486 return;
ee1bec3d 487 }
eb12dd0c 488 if (process_path(path, &st, stat_errno))
e011054b 489 die("Unable to process path %s", path);
caf4f582 490 report("add '%s'", path);
ee1bec3d
JH
491}
492
7e07ed84 493static void read_index_info(int nul_term_line)
d4dbf36d 494{
1928c944 495 const int hexsz = the_hash_algo->hexsz;
f285a2d7
BC
496 struct strbuf buf = STRBUF_INIT;
497 struct strbuf uq = STRBUF_INIT;
7e07ed84 498 strbuf_getline_fn getline_fn;
7fb1011e 499
7e07ed84
JH
500 getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
501 while (getline_fn(&buf, stdin) != EOF) {
9c20a470 502 char *ptr, *tab;
973d6a20 503 char *path_name;
71445a0f 504 struct object_id oid;
d4dbf36d 505 unsigned int mode;
6aead43d 506 unsigned long ul;
d23748a6
JH
507 int stage;
508
509 /* This reads lines formatted in one of three formats:
510 *
511 * (1) mode SP sha1 TAB path
f18d244a 512 * The first format is what "git apply --index-info"
d23748a6
JH
513 * reports, and used to reconstruct a partial tree
514 * that is used for phony merge base tree when falling
515 * back on 3-way merge.
516 *
517 * (2) mode SP type SP sha1 TAB path
f18d244a 518 * The second format is to stuff "git ls-tree" output
d23748a6 519 * into the index file.
fefe81c9 520 *
d23748a6
JH
521 * (3) mode SP sha1 SP stage TAB path
522 * This format is to put higher order stages into the
f18d244a 523 * index file and matches "git ls-files --stage" output.
d23748a6 524 */
6aead43d
JM
525 errno = 0;
526 ul = strtoul(buf.buf, &ptr, 8);
527 if (ptr == buf.buf || *ptr != ' '
528 || errno || (unsigned int) ul != ul)
d4dbf36d 529 goto bad_line;
6aead43d 530 mode = ul;
d4dbf36d 531
9c20a470 532 tab = strchr(ptr, '\t');
1928c944 533 if (!tab || tab - ptr < hexsz + 1)
9c20a470 534 goto bad_line;
d23748a6 535
2d497115 536 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
d23748a6
JH
537 stage = tab[-1] - '0';
538 ptr = tab + 1; /* point at the head of path */
539 tab = tab - 2; /* point at tail of sha1 */
540 }
541 else {
542 stage = 0;
543 ptr = tab + 1; /* point at the head of path */
544 }
545
1928c944 546 if (get_oid_hex(tab - hexsz, &oid) ||
547 tab[-(hexsz + 1)] != ' ')
9c20a470 548 goto bad_line;
973d6a20 549
7fb1011e 550 path_name = ptr;
7e07ed84 551 if (!nul_term_line && path_name[0] == '"') {
7fb1011e
PH
552 strbuf_reset(&uq);
553 if (unquote_c_style(&uq, path_name, NULL)) {
7e44c935 554 die("git update-index: bad quoting of path name");
7fb1011e
PH
555 }
556 path_name = uq.buf;
557 }
973d6a20 558
10ecfa76 559 if (!verify_path(path_name, mode)) {
973d6a20 560 fprintf(stderr, "Ignoring path %s\n", path_name);
d4dbf36d
JH
561 continue;
562 }
563
564 if (!mode) {
565 /* mode == 0 means there is no such path -- remove */
973d6a20 566 if (remove_file_from_cache(path_name))
7e44c935 567 die("git update-index: unable to remove %s",
d4dbf36d
JH
568 ptr);
569 }
570 else {
571 /* mode ' ' sha1 '\t' name
572 * ptr[-1] points at tab,
573 * ptr[-41] is at the beginning of sha1
574 */
1928c944 575 ptr[-(hexsz + 2)] = ptr[-1] = 0;
71445a0f 576 if (add_cacheinfo(mode, &oid, path_name, stage))
7e44c935 577 die("git update-index: unable to update %s",
973d6a20 578 path_name);
d4dbf36d
JH
579 }
580 continue;
581
582 bad_line:
583 die("malformed index info %s", buf.buf);
584 }
e6c019d0 585 strbuf_release(&buf);
7fb1011e 586 strbuf_release(&uq);
d4dbf36d
JH
587}
588
309be813 589static const char * const update_index_usage[] = {
9c9b4f2f 590 N_("git update-index [<options>] [--] [<file>...]"),
309be813
JN
591 NULL
592};
f6ab5bb2 593
71445a0f 594static struct object_id head_oid;
595static struct object_id merge_head_oid;
2bd452d3
JH
596
597static struct cache_entry *read_one_ent(const char *which,
71445a0f 598 struct object_id *ent, const char *path,
2bd452d3
JH
599 int namelen, int stage)
600{
601 unsigned mode;
71445a0f 602 struct object_id oid;
2bd452d3
JH
603 int size;
604 struct cache_entry *ce;
605
916bc35b 606 if (get_tree_entry(ent, path, &oid, &mode)) {
83e77a25
JH
607 if (which)
608 error("%s: not in %s branch.", path, which);
2bd452d3
JH
609 return NULL;
610 }
611 if (mode == S_IFDIR) {
83e77a25
JH
612 if (which)
613 error("%s: not a blob in %s branch.", path, which);
2bd452d3
JH
614 return NULL;
615 }
616 size = cache_entry_size(namelen);
617 ce = xcalloc(1, size);
618
71445a0f 619 oidcpy(&ce->oid, &oid);
2bd452d3 620 memcpy(ce->name, path, namelen);
b60e188c
TG
621 ce->ce_flags = create_ce_flags(stage);
622 ce->ce_namelen = namelen;
2bd452d3
JH
623 ce->ce_mode = create_ce_mode(mode);
624 return ce;
625}
626
627static int unresolve_one(const char *path)
628{
629 int namelen = strlen(path);
630 int pos;
631 int ret = 0;
632 struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
633
634 /* See if there is such entry in the index. */
635 pos = cache_name_pos(path, namelen);
8aa38563
JH
636 if (0 <= pos) {
637 /* already merged */
638 pos = unmerge_cache_entry_at(pos);
639 if (pos < active_nr) {
9c5e6c80 640 const struct cache_entry *ce = active_cache[pos];
8aa38563
JH
641 if (ce_stage(ce) &&
642 ce_namelen(ce) == namelen &&
643 !memcmp(ce->name, path, namelen))
644 return 0;
645 }
646 /* no resolve-undo information; fall back */
647 } else {
2bd452d3
JH
648 /* If there isn't, either it is unmerged, or
649 * resolved as "removed" by mistake. We do not
650 * want to do anything in the former case.
651 */
652 pos = -pos-1;
653 if (pos < active_nr) {
9c5e6c80 654 const struct cache_entry *ce = active_cache[pos];
2bd452d3
JH
655 if (ce_namelen(ce) == namelen &&
656 !memcmp(ce->name, path, namelen)) {
657 fprintf(stderr,
658 "%s: skipping still unmerged path.\n",
659 path);
660 goto free_return;
661 }
662 }
663 }
664
665 /* Grab blobs from given path from HEAD and MERGE_HEAD,
666 * stuff HEAD version in stage #2,
667 * stuff MERGE_HEAD version in stage #3.
668 */
71445a0f 669 ce_2 = read_one_ent("our", &head_oid, path, namelen, 2);
670 ce_3 = read_one_ent("their", &merge_head_oid, path, namelen, 3);
2bd452d3
JH
671
672 if (!ce_2 || !ce_3) {
673 ret = -1;
674 goto free_return;
675 }
99d1a986 676 if (!oidcmp(&ce_2->oid, &ce_3->oid) &&
2bd452d3
JH
677 ce_2->ce_mode == ce_3->ce_mode) {
678 fprintf(stderr, "%s: identical in both, skipping.\n",
679 path);
680 goto free_return;
681 }
682
683 remove_file_from_cache(path);
684 if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
685 error("%s: cannot add our version to the index.", path);
686 ret = -1;
687 goto free_return;
688 }
689 if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
690 return 0;
691 error("%s: cannot add their version to the index.", path);
692 ret = -1;
693 free_return:
694 free(ce_2);
695 free(ce_3);
696 return ret;
697}
698
699static void read_head_pointers(void)
700{
34c290a6 701 if (read_ref("HEAD", &head_oid))
d7530708 702 die("No HEAD -- no initial commit yet?");
34c290a6 703 if (read_ref("MERGE_HEAD", &merge_head_oid)) {
2bd452d3
JH
704 fprintf(stderr, "Not in the middle of a merge.\n");
705 exit(0);
706 }
707}
708
09895c1f
JH
709static int do_unresolve(int ac, const char **av,
710 const char *prefix, int prefix_length)
2bd452d3
JH
711{
712 int i;
713 int err = 0;
714
715 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
716 * are not doing a merge, so exit with success status.
717 */
718 read_head_pointers();
719
720 for (i = 1; i < ac; i++) {
721 const char *arg = av[i];
d7a643b7 722 char *p = prefix_path(prefix, prefix_length, arg);
09895c1f 723 err |= unresolve_one(p);
d7a643b7 724 free(p);
2bd452d3
JH
725 }
726 return err;
727}
728
83e77a25
JH
729static int do_reupdate(int ac, const char **av,
730 const char *prefix, int prefix_length)
731{
732 /* Read HEAD and run update-index on paths that are
733 * merged and already different between index and HEAD.
734 */
735 int pos;
736 int has_head = 1;
eb9cb55b
NTND
737 struct pathspec pathspec;
738
0fdc2ae5
NTND
739 parse_pathspec(&pathspec, 0,
740 PATHSPEC_PREFER_CWD,
741 prefix, av + 1);
83e77a25 742
34c290a6 743 if (read_ref("HEAD", &head_oid))
83e77a25
JH
744 /* If there is no HEAD, that means it is an initial
745 * commit. Update everything in the index.
746 */
747 has_head = 0;
748 redo:
749 for (pos = 0; pos < active_nr; pos++) {
9c5e6c80 750 const struct cache_entry *ce = active_cache[pos];
83e77a25
JH
751 struct cache_entry *old = NULL;
752 int save_nr;
5699d17e 753 char *path;
22293b9c 754
429bb40a 755 if (ce_stage(ce) || !ce_path_match(ce, &pathspec, NULL))
83e77a25
JH
756 continue;
757 if (has_head)
71445a0f 758 old = read_one_ent(NULL, &head_oid,
83e77a25
JH
759 ce->name, ce_namelen(ce), 0);
760 if (old && ce->ce_mode == old->ce_mode &&
99d1a986 761 !oidcmp(&ce->oid, &old->oid)) {
83e77a25
JH
762 free(old);
763 continue; /* unchanged */
764 }
765 /* Be careful. The working tree may not have the
766 * path anymore, in which case, under 'allow_remove',
767 * or worse yet 'allow_replace', active_nr may decrease.
768 */
769 save_nr = active_nr;
5699d17e
KB
770 path = xstrdup(ce->name);
771 update_one(path);
772 free(path);
1b7cb896 773 free(old);
83e77a25
JH
774 if (save_nr != active_nr)
775 goto redo;
776 }
ed6e8038 777 clear_pathspec(&pathspec);
83e77a25
JH
778 return 0;
779}
780
309be813
JN
781struct refresh_params {
782 unsigned int flags;
783 int *has_errors;
784};
785
786static int refresh(struct refresh_params *o, unsigned int flag)
787{
788 setup_work_tree();
7349afd2 789 read_cache_preload(NULL);
309be813
JN
790 *o->has_errors |= refresh_cache(o->flags | flag);
791 return 0;
792}
793
794static int refresh_callback(const struct option *opt,
795 const char *arg, int unset)
796{
797 return refresh(opt->value, 0);
798}
799
800static int really_refresh_callback(const struct option *opt,
801 const char *arg, int unset)
802{
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;
810 if ((arg[0] != '-' && arg[0] != '+') || arg[1] != 'x' || arg[2])
811 return error("option 'chmod' expects \"+x\" or \"-x\"");
812 *flip = arg[0];
813 return 0;
814}
815
816static int resolve_undo_clear_callback(const struct option *opt,
817 const char *arg, int unset)
818{
819 resolve_undo_clear();
820 return 0;
821}
822
ec160ae1
JH
823static int parse_new_style_cacheinfo(const char *arg,
824 unsigned int *mode,
71445a0f 825 struct object_id *oid,
ec160ae1
JH
826 const char **path)
827{
828 unsigned long ul;
829 char *endp;
830
c8e1ee4f
JK
831 if (!arg)
832 return -1;
833
ec160ae1
JH
834 errno = 0;
835 ul = strtoul(arg, &endp, 8);
836 if (errno || endp == arg || *endp != ',' || (unsigned int) ul != ul)
837 return -1; /* not a new-style cacheinfo */
838 *mode = ul;
839 endp++;
71445a0f 840 if (get_oid_hex(endp, oid) || endp[GIT_SHA1_HEXSZ] != ',')
ec160ae1 841 return -1;
71445a0f 842 *path = endp + GIT_SHA1_HEXSZ + 1;
ec160ae1
JH
843 return 0;
844}
845
309be813
JN
846static int cacheinfo_callback(struct parse_opt_ctx_t *ctx,
847 const struct option *opt, int unset)
848{
71445a0f 849 struct object_id oid;
309be813 850 unsigned int mode;
ec160ae1 851 const char *path;
309be813 852
71445a0f 853 if (!parse_new_style_cacheinfo(ctx->argv[1], &mode, &oid, &path)) {
854 if (add_cacheinfo(mode, &oid, path, 0))
ec160ae1
JH
855 die("git update-index: --cacheinfo cannot add %s", path);
856 ctx->argv++;
857 ctx->argc--;
858 return 0;
859 }
309be813 860 if (ctx->argc <= 3)
ec160ae1 861 return error("option 'cacheinfo' expects <mode>,<sha1>,<path>");
309be813 862 if (strtoul_ui(*++ctx->argv, 8, &mode) ||
71445a0f 863 get_oid_hex(*++ctx->argv, &oid) ||
864 add_cacheinfo(mode, &oid, *++ctx->argv, 0))
309be813
JN
865 die("git update-index: --cacheinfo cannot add %s", *ctx->argv);
866 ctx->argc -= 3;
867 return 0;
868}
869
870static int stdin_cacheinfo_callback(struct parse_opt_ctx_t *ctx,
871 const struct option *opt, int unset)
872{
7e07ed84 873 int *nul_term_line = opt->value;
309be813
JN
874
875 if (ctx->argc != 1)
876 return error("option '%s' must be the last argument", opt->long_name);
877 allow_add = allow_replace = allow_remove = 1;
7e07ed84 878 read_index_info(*nul_term_line);
309be813
JN
879 return 0;
880}
881
882static int stdin_callback(struct parse_opt_ctx_t *ctx,
883 const struct option *opt, int unset)
884{
885 int *read_from_stdin = opt->value;
886
887 if (ctx->argc != 1)
888 return error("option '%s' must be the last argument", opt->long_name);
889 *read_from_stdin = 1;
890 return 0;
891}
892
893static int unresolve_callback(struct parse_opt_ctx_t *ctx,
894 const struct option *opt, int flags)
895{
896 int *has_errors = opt->value;
897 const char *prefix = startup_info->prefix;
898
899 /* consume remaining arguments. */
900 *has_errors = do_unresolve(ctx->argc, ctx->argv,
901 prefix, prefix ? strlen(prefix) : 0);
902 if (*has_errors)
903 active_cache_changed = 0;
904
905 ctx->argv += ctx->argc - 1;
906 ctx->argc = 1;
907 return 0;
908}
909
910static int reupdate_callback(struct parse_opt_ctx_t *ctx,
911 const struct option *opt, int flags)
912{
913 int *has_errors = opt->value;
914 const char *prefix = startup_info->prefix;
915
916 /* consume remaining arguments. */
917 setup_work_tree();
918 *has_errors = do_reupdate(ctx->argc, ctx->argv,
919 prefix, prefix ? strlen(prefix) : 0);
920 if (*has_errors)
921 active_cache_changed = 0;
922
923 ctx->argv += ctx->argc - 1;
924 ctx->argc = 1;
925 return 0;
926}
927
a633fca0 928int cmd_update_index(int argc, const char **argv, const char *prefix)
e83c5163 929{
7e07ed84 930 int newfd, entries, has_errors = 0, nul_term_line = 0;
113e6413 931 enum uc_mode untracked_cache = UC_UNSPECIFIED;
ee1bec3d 932 int read_from_stdin = 0;
ee1bec3d 933 int prefix_length = prefix ? strlen(prefix) : 0;
69dec66b 934 int preferred_index_format = 0;
227bdb18 935 char set_executable_bit = 0;
309be813 936 struct refresh_params refresh_args = {0, &has_errors};
7b802b86 937 int lock_error = 0;
c18b80a0 938 int split_index = -1;
7c545be9 939 int force_write = 0;
9d406cba 940 int fsmonitor = -1;
bfffb48c 941 struct lock_file lock_file = LOCK_INIT;
309be813 942 struct parse_opt_ctx_t ctx;
7e07ed84 943 strbuf_getline_fn getline_fn;
309be813
JN
944 int parseopt_state = PARSE_OPT_UNKNOWN;
945 struct option options[] = {
946 OPT_BIT('q', NULL, &refresh_args.flags,
4a4838b4 947 N_("continue refresh even when index needs update"),
309be813
JN
948 REFRESH_QUIET),
949 OPT_BIT(0, "ignore-submodules", &refresh_args.flags,
4a4838b4 950 N_("refresh: ignore submodules"),
309be813
JN
951 REFRESH_IGNORE_SUBMODULES),
952 OPT_SET_INT(0, "add", &allow_add,
4a4838b4 953 N_("do not ignore new files"), 1),
309be813 954 OPT_SET_INT(0, "replace", &allow_replace,
4a4838b4 955 N_("let files replace directories and vice-versa"), 1),
309be813 956 OPT_SET_INT(0, "remove", &allow_remove,
4a4838b4 957 N_("notice files missing from worktree"), 1),
309be813 958 OPT_BIT(0, "unmerged", &refresh_args.flags,
4a4838b4 959 N_("refresh even if index contains unmerged entries"),
309be813
JN
960 REFRESH_UNMERGED),
961 {OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL,
4a4838b4 962 N_("refresh stat information"),
309be813
JN
963 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
964 refresh_callback},
965 {OPTION_CALLBACK, 0, "really-refresh", &refresh_args, NULL,
4a4838b4 966 N_("like --refresh, but ignore assume-unchanged setting"),
309be813
JN
967 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
968 really_refresh_callback},
969 {OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
ec160ae1 970 N_("<mode>,<object>,<path>"),
4a4838b4 971 N_("add the specified entry to the index"),
ec160ae1 972 PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
309be813
JN
973 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
974 (parse_opt_cb *) cacheinfo_callback},
4a4838b4
NTND
975 {OPTION_CALLBACK, 0, "chmod", &set_executable_bit, N_("(+/-)x"),
976 N_("override the executable bit of the listed files"),
309be813
JN
977 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
978 chmod_callback},
979 {OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
4a4838b4 980 N_("mark files as \"not changing\""),
309be813
JN
981 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
982 {OPTION_SET_INT, 0, "no-assume-unchanged", &mark_valid_only, NULL,
4a4838b4 983 N_("clear assumed-unchanged bit"),
309be813
JN
984 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
985 {OPTION_SET_INT, 0, "skip-worktree", &mark_skip_worktree_only, NULL,
4a4838b4 986 N_("mark files as \"index-only\""),
309be813
JN
987 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
988 {OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
4a4838b4 989 N_("clear skip-worktree bit"),
309be813
JN
990 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
991 OPT_SET_INT(0, "info-only", &info_only,
4a4838b4 992 N_("add to index only; do not add content to object database"), 1),
309be813 993 OPT_SET_INT(0, "force-remove", &force_remove,
4a4838b4 994 N_("remove named paths even if present in worktree"), 1),
7e07ed84
JH
995 OPT_BOOL('z', NULL, &nul_term_line,
996 N_("with --stdin: input lines are terminated by null bytes")),
309be813 997 {OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
4a4838b4 998 N_("read list of paths to be updated from standard input"),
309be813
JN
999 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1000 (parse_opt_cb *) stdin_callback},
7e07ed84 1001 {OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &nul_term_line, NULL,
4a4838b4 1002 N_("add entries from standard input to the index"),
309be813
JN
1003 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1004 (parse_opt_cb *) stdin_cacheinfo_callback},
1005 {OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
4a4838b4 1006 N_("repopulate stages #2 and #3 for the listed paths"),
309be813
JN
1007 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1008 (parse_opt_cb *) unresolve_callback},
1009 {OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
4a4838b4 1010 N_("only update entries that differ from HEAD"),
309be813
JN
1011 PARSE_OPT_NONEG | PARSE_OPT_NOARG,
1012 (parse_opt_cb *) reupdate_callback},
1013 OPT_BIT(0, "ignore-missing", &refresh_args.flags,
4a4838b4 1014 N_("ignore files missing from worktree"),
309be813
JN
1015 REFRESH_IGNORE_MISSING),
1016 OPT_SET_INT(0, "verbose", &verbose,
4a4838b4 1017 N_("report actions to standard output"), 1),
309be813 1018 {OPTION_CALLBACK, 0, "clear-resolve-undo", NULL, NULL,
4a4838b4 1019 N_("(for porcelains) forget saved unresolved conflicts"),
309be813
JN
1020 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1021 resolve_undo_clear_callback},
69dec66b 1022 OPT_INTEGER(0, "index-version", &preferred_index_format,
4a4838b4 1023 N_("write index in this format")),
c18b80a0
NTND
1024 OPT_BOOL(0, "split-index", &split_index,
1025 N_("enable or disable split index")),
9e597241
NTND
1026 OPT_BOOL(0, "untracked-cache", &untracked_cache,
1027 N_("enable/disable untracked cache")),
eaab83d0
CC
1028 OPT_SET_INT(0, "test-untracked-cache", &untracked_cache,
1029 N_("test if the filesystem supports untracked cache"), UC_TEST),
f64cb88d 1030 OPT_SET_INT(0, "force-untracked-cache", &untracked_cache,
113e6413 1031 N_("enable untracked cache without testing the filesystem"), UC_FORCE),
7c545be9
BP
1032 OPT_SET_INT(0, "force-write-index", &force_write,
1033 N_("write out the index even if is not flagged as changed"), 1),
9d406cba
BP
1034 OPT_BOOL(0, "fsmonitor", &fsmonitor,
1035 N_("enable or disable file system monitor")),
1036 {OPTION_SET_INT, 0, "fsmonitor-valid", &mark_fsmonitor_only, NULL,
1037 N_("mark files as fsmonitor valid"),
1038 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
1039 {OPTION_SET_INT, 0, "no-fsmonitor-valid", &mark_fsmonitor_only, NULL,
1040 N_("clear fsmonitor valid bit"),
1041 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
309be813
JN
1042 OPT_END()
1043 };
bb233d69 1044
9c7c27ee 1045 if (argc == 2 && !strcmp(argv[1], "-h"))
b04d930b 1046 usage_with_options(update_index_usage, options);
9c7c27ee 1047
ef90d6d4 1048 git_config(git_default_config, NULL);
3e09cdfd 1049
b3e83cc7 1050 /* we will diagnose later if it turns out that we need to update it */
bfffb48c 1051 newfd = hold_locked_index(&lock_file, 0);
7b802b86
JH
1052 if (newfd < 0)
1053 lock_error = errno;
9614b8dc 1054
e83c5163 1055 entries = read_cache();
9614b8dc 1056 if (entries < 0)
2de381f9 1057 die("cache corrupted");
e83c5163 1058
309be813
JN
1059 /*
1060 * Custom copy of parse_options() because we want to handle
1061 * filename arguments as they come.
1062 */
1063 parse_options_start(&ctx, argc, argv, prefix,
1064 options, PARSE_OPT_STOP_AT_NON_OPTION);
1065 while (ctx.argc) {
1066 if (parseopt_state != PARSE_OPT_DONE)
1067 parseopt_state = parse_options_step(&ctx, options,
1068 update_index_usage);
1069 if (!ctx.argc)
1070 break;
1071 switch (parseopt_state) {
1072 case PARSE_OPT_HELP:
3bb0923f 1073 case PARSE_OPT_ERROR:
309be813
JN
1074 exit(129);
1075 case PARSE_OPT_NON_OPTION:
1076 case PARSE_OPT_DONE:
1077 {
1078 const char *path = ctx.argv[0];
d7a643b7 1079 char *p;
121481ab 1080
309be813
JN
1081 setup_work_tree();
1082 p = prefix_path(prefix, prefix_length, path);
6bb69077 1083 update_one(p);
309be813
JN
1084 if (set_executable_bit)
1085 chmod_path(set_executable_bit, p);
d7a643b7 1086 free(p);
309be813
JN
1087 ctx.argc--;
1088 ctx.argv++;
1089 break;
1090 }
1091 case PARSE_OPT_UNKNOWN:
1092 if (ctx.argv[0][1] == '-')
1093 error("unknown option '%s'", ctx.argv[0] + 2);
1094 else
1095 error("unknown switch '%c'", *ctx.opt);
1096 usage_with_options(update_index_usage, options);
121481ab 1097 }
ee1bec3d 1098 }
309be813 1099 argc = parse_options_end(&ctx);
7e07ed84
JH
1100
1101 getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
69dec66b
JH
1102 if (preferred_index_format) {
1103 if (preferred_index_format < INDEX_FORMAT_LB ||
1104 INDEX_FORMAT_UB < preferred_index_format)
1105 die("index-version %d not in range: %d..%d",
1106 preferred_index_format,
1107 INDEX_FORMAT_LB, INDEX_FORMAT_UB);
1108
1109 if (the_index.version != preferred_index_format)
782a5ff9 1110 active_cache_changed |= SOMETHING_CHANGED;
69dec66b
JH
1111 the_index.version = preferred_index_format;
1112 }
309be813 1113
ee1bec3d 1114 if (read_from_stdin) {
0d4cc1b4
JK
1115 struct strbuf buf = STRBUF_INIT;
1116 struct strbuf unquoted = STRBUF_INIT;
7fb1011e 1117
f83eafdd 1118 setup_work_tree();
7e07ed84 1119 while (getline_fn(&buf, stdin) != EOF) {
d7a643b7 1120 char *p;
7e07ed84 1121 if (!nul_term_line && buf.buf[0] == '"') {
0d4cc1b4
JK
1122 strbuf_reset(&unquoted);
1123 if (unquote_c_style(&unquoted, buf.buf, NULL))
7fb1011e 1124 die("line is badly quoted");
0d4cc1b4 1125 strbuf_swap(&buf, &unquoted);
7fb1011e
PH
1126 }
1127 p = prefix_path(prefix, prefix_length, buf.buf);
6bb69077 1128 update_one(p);
fb69a760 1129 if (set_executable_bit)
227bdb18 1130 chmod_path(set_executable_bit, p);
d7a643b7 1131 free(p);
9b63f501 1132 }
0d4cc1b4 1133 strbuf_release(&unquoted);
e6c019d0 1134 strbuf_release(&buf);
e83c5163 1135 }
2bd452d3 1136
c18b80a0 1137 if (split_index > 0) {
6cc10533
CC
1138 if (git_config_get_split_index() == 0)
1139 warning(_("core.splitIndex is set to false; "
1140 "remove or change it, if you really want to "
1141 "enable split index"));
cef4fc7e
CC
1142 if (the_index.split_index)
1143 the_index.cache_changed |= SPLIT_INDEX_ORDERED;
1144 else
1145 add_split_index(&the_index);
6cc10533
CC
1146 } else if (!split_index) {
1147 if (git_config_get_split_index() == 1)
1148 warning(_("core.splitIndex is set to true; "
1149 "remove or change it, if you really want to "
1150 "disable split index"));
cef4fc7e 1151 remove_split_index(&the_index);
6cc10533 1152 }
9e597241 1153
435ec090
CC
1154 switch (untracked_cache) {
1155 case UC_UNSPECIFIED:
1156 break;
1157 case UC_DISABLE:
1158 if (git_config_get_untracked_cache() == 1)
43073f89
VA
1159 warning(_("core.untrackedCache is set to true; "
1160 "remove or change it, if you really want to "
1161 "disable the untracked cache"));
07b29bfd 1162 remove_untracked_cache(&the_index);
6d19db14 1163 report(_("Untracked cache disabled"));
435ec090
CC
1164 break;
1165 case UC_TEST:
1166 setup_work_tree();
1167 return !test_if_untracked_cache_is_supported();
1168 case UC_ENABLE:
1169 case UC_FORCE:
1170 if (git_config_get_untracked_cache() == 0)
43073f89
VA
1171 warning(_("core.untrackedCache is set to false; "
1172 "remove or change it, if you really want to "
1173 "enable the untracked cache"));
435ec090
CC
1174 add_untracked_cache(&the_index);
1175 report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
1176 break;
1177 default:
033abf97 1178 BUG("bad untracked_cache value: %d", untracked_cache);
9e597241 1179 }
c18b80a0 1180
9d406cba
BP
1181 if (fsmonitor > 0) {
1182 if (git_config_get_fsmonitor() == 0)
1183 warning(_("core.fsmonitor is unset; "
1184 "set it if you really want to "
1185 "enable fsmonitor"));
1186 add_fsmonitor(&the_index);
1187 report(_("fsmonitor enabled"));
1188 } else if (!fsmonitor) {
1189 if (git_config_get_fsmonitor() == 1)
1190 warning(_("core.fsmonitor is set; "
1191 "remove it if you really want to "
1192 "disable fsmonitor"));
1193 remove_fsmonitor(&the_index);
1194 report(_("fsmonitor disabled"));
1195 }
1196
7c545be9 1197 if (active_cache_changed || force_write) {
7b802b86 1198 if (newfd < 0) {
309be813 1199 if (refresh_args.flags & REFRESH_QUIET)
7b802b86 1200 exit(128);
e197c218 1201 unable_to_lock_die(get_index_file(), lock_error);
7b802b86 1202 }
bfffb48c 1203 if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
021b6e45 1204 die("Unable to write new index file");
5cd5ace7 1205 }
9614b8dc 1206
bfffb48c 1207 rollback_lock_file(&lock_file);
fefe81c9 1208
c4b83e61 1209 return has_errors ? 1 : 0;
e83c5163 1210}