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