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