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