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