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