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