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