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