]>
Commit | Line | Data |
---|---|---|
8bc9a0c7 LT |
1 | /* |
2 | * GIT - The information manager from hell | |
3 | * | |
4 | * Copyright (C) Linus Torvalds, 2005 | |
5 | */ | |
e83c5163 | 6 | #include "cache.h" |
973d6a20 | 7 | #include "quote.h" |
a6e5642f | 8 | #include "cache-tree.h" |
2bd452d3 | 9 | #include "tree-walk.h" |
fefe81c9 | 10 | #include "builtin.h" |
e011054b | 11 | #include "refs.h" |
e83c5163 | 12 | |
121481ab LT |
13 | /* |
14 | * Default to not allowing changes to the list of files. The | |
15 | * tool doesn't actually care, but this makes it harder to add | |
16 | * files to the revision control by mistake by doing something | |
215a7ad1 | 17 | * like "git-update-index *" and suddenly having all the object |
121481ab LT |
18 | * files be revision controlled. |
19 | */ | |
caf4f582 JH |
20 | static int allow_add; |
21 | static int allow_remove; | |
22 | static int allow_replace; | |
caf4f582 | 23 | static int info_only; |
9b63f501 | 24 | static int force_remove; |
caf4f582 | 25 | static int verbose; |
96f1e58f | 26 | static int mark_valid_only; |
5f73076c JH |
27 | #define MARK_VALID 1 |
28 | #define UNMARK_VALID 2 | |
29 | ||
caf4f582 JH |
30 | static void report(const char *fmt, ...) |
31 | { | |
32 | va_list vp; | |
33 | ||
34 | if (!verbose) | |
35 | return; | |
36 | ||
37 | va_start(vp, fmt); | |
38 | vprintf(fmt, vp); | |
39 | putchar('\n'); | |
40 | va_end(vp); | |
41 | } | |
42 | ||
5f73076c JH |
43 | static int mark_valid(const char *path) |
44 | { | |
45 | int namelen = strlen(path); | |
46 | int pos = cache_name_pos(path, namelen); | |
47 | if (0 <= pos) { | |
48 | switch (mark_valid_only) { | |
49 | case MARK_VALID: | |
7a51ed66 | 50 | active_cache[pos]->ce_flags |= CE_VALID; |
5f73076c JH |
51 | break; |
52 | case UNMARK_VALID: | |
7a51ed66 | 53 | active_cache[pos]->ce_flags &= ~CE_VALID; |
5f73076c JH |
54 | break; |
55 | } | |
a6e5642f | 56 | cache_tree_invalidate_path(active_cache_tree, path); |
5f73076c JH |
57 | active_cache_changed = 1; |
58 | return 0; | |
59 | } | |
60 | return -1; | |
61 | } | |
62 | ||
e011054b | 63 | static int remove_one_path(const char *path) |
e83c5163 | 64 | { |
e011054b LT |
65 | if (!allow_remove) |
66 | return error("%s: does not exist and --remove not passed", path); | |
67 | if (remove_file_from_cache(path)) | |
68 | return error("%s: cannot remove from the index", path); | |
69 | return 0; | |
70 | } | |
a6e5642f | 71 | |
e011054b LT |
72 | /* |
73 | * Handle a path that couldn't be lstat'ed. It's either: | |
74 | * - missing file (ENOENT or ENOTDIR). That's ok if we're | |
75 | * supposed to be removing it and the removal actually | |
76 | * succeeds. | |
77 | * - permission error. That's never ok. | |
78 | */ | |
79 | static int process_lstat_error(const char *path, int err) | |
80 | { | |
81 | if (err == ENOENT || err == ENOTDIR) | |
82 | return remove_one_path(path); | |
83 | return error("lstat(\"%s\"): %s", path, strerror(errno)); | |
84 | } | |
a6e5642f | 85 | |
e011054b LT |
86 | static int add_one_path(struct cache_entry *old, const char *path, int len, struct stat *st) |
87 | { | |
22631473 LT |
88 | int option, size; |
89 | struct cache_entry *ce; | |
3e09cdfd | 90 | |
22631473 LT |
91 | /* Was the old index entry already up-to-date? */ |
92 | if (old && !ce_stage(old) && !ce_match_stat(old, st, 0)) | |
93 | return 0; | |
94 | ||
95 | size = cache_entry_size(len); | |
96 | ce = xcalloc(1, size); | |
e011054b | 97 | memcpy(ce->name, path, len); |
7a51ed66 | 98 | ce->ce_flags = len; |
e011054b LT |
99 | fill_stat_cache_info(ce, st); |
100 | ce->ce_mode = ce_mode_from_stat(old, st->st_mode); | |
ec1fcc16 | 101 | |
e011054b | 102 | if (index_path(ce->sha1, path, st, !info_only)) |
ec1fcc16 | 103 | return -1; |
192268c1 JH |
104 | option = allow_add ? ADD_CACHE_OK_TO_ADD : 0; |
105 | option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0; | |
34143b26 | 106 | if (add_cache_entry(ce, option)) |
e011054b | 107 | return error("%s: cannot add to the index - missing --add option?", path); |
34143b26 | 108 | return 0; |
121481ab LT |
109 | } |
110 | ||
e011054b LT |
111 | /* |
112 | * Handle a path that was a directory. Four cases: | |
113 | * | |
114 | * - it's already a gitlink in the index, and we keep it that | |
115 | * way, and update it if we can (if we cannot find the HEAD, | |
116 | * we're going to keep it unchanged in the index!) | |
117 | * | |
118 | * - it's a *file* in the index, in which case it should be | |
119 | * removed as a file if removal is allowed, since it doesn't | |
120 | * exist as such any more. If removal isn't allowed, it's | |
121 | * an error. | |
122 | * | |
123 | * (NOTE! This is old and arguably fairly strange behaviour. | |
124 | * We might want to make this an error unconditionally, and | |
125 | * use "--force-remove" if you actually want to force removal). | |
126 | * | |
127 | * - it used to exist as a subdirectory (ie multiple files with | |
128 | * this particular prefix) in the index, in which case it's wrong | |
129 | * to try to update it as a directory. | |
130 | * | |
131 | * - it doesn't exist at all in the index, but it is a valid | |
132 | * git directory, and it should be *added* as a gitlink. | |
133 | */ | |
134 | static int process_directory(const char *path, int len, struct stat *st) | |
135 | { | |
136 | unsigned char sha1[20]; | |
137 | int pos = cache_name_pos(path, len); | |
138 | ||
139 | /* Exact match: file or existing gitlink */ | |
140 | if (pos >= 0) { | |
141 | struct cache_entry *ce = active_cache[pos]; | |
7a51ed66 | 142 | if (S_ISGITLINK(ce->ce_mode)) { |
e011054b LT |
143 | |
144 | /* Do nothing to the index if there is no HEAD! */ | |
145 | if (resolve_gitlink_ref(path, "HEAD", sha1) < 0) | |
146 | return 0; | |
147 | ||
148 | return add_one_path(ce, path, len, st); | |
149 | } | |
150 | /* Should this be an unconditional error? */ | |
151 | return remove_one_path(path); | |
152 | } | |
153 | ||
154 | /* Inexact match: is there perhaps a subdirectory match? */ | |
155 | pos = -pos-1; | |
156 | while (pos < active_nr) { | |
157 | struct cache_entry *ce = active_cache[pos++]; | |
158 | ||
159 | if (strncmp(ce->name, path, len)) | |
160 | break; | |
161 | if (ce->name[len] > '/') | |
162 | break; | |
163 | if (ce->name[len] < '/') | |
164 | continue; | |
165 | ||
166 | /* Subdirectory match - error out */ | |
167 | return error("%s: is a directory - add individual files instead", path); | |
168 | } | |
169 | ||
170 | /* No match - should we add it as a gitlink? */ | |
171 | if (!resolve_gitlink_ref(path, "HEAD", sha1)) | |
172 | return add_one_path(NULL, path, len, st); | |
173 | ||
174 | /* Error out. */ | |
175 | return error("%s: is a directory - add files inside instead", path); | |
176 | } | |
177 | ||
178 | /* | |
179 | * Process a regular file | |
180 | */ | |
181 | static int process_file(const char *path, int len, struct stat *st) | |
182 | { | |
183 | int pos = cache_name_pos(path, len); | |
184 | struct cache_entry *ce = pos < 0 ? NULL : active_cache[pos]; | |
185 | ||
7a51ed66 | 186 | if (ce && S_ISGITLINK(ce->ce_mode)) |
e011054b LT |
187 | return error("%s is already a gitlink, not replacing", path); |
188 | ||
189 | return add_one_path(ce, path, len, st); | |
190 | } | |
191 | ||
192 | static int process_path(const char *path) | |
193 | { | |
194 | int len; | |
195 | struct stat st; | |
196 | ||
e011054b LT |
197 | /* |
198 | * First things first: get the stat information, to decide | |
199 | * what to do about the pathname! | |
200 | */ | |
201 | if (lstat(path, &st) < 0) | |
202 | return process_lstat_error(path, errno); | |
203 | ||
204 | len = strlen(path); | |
205 | if (S_ISDIR(st.st_mode)) | |
206 | return process_directory(path, len, &st); | |
207 | ||
208 | return process_file(path, len, &st); | |
209 | } | |
210 | ||
d23748a6 JH |
211 | static int add_cacheinfo(unsigned int mode, const unsigned char *sha1, |
212 | const char *path, int stage) | |
9945d980 | 213 | { |
192268c1 | 214 | int size, len, option; |
9945d980 LT |
215 | struct cache_entry *ce; |
216 | ||
d23748a6 | 217 | if (!verify_path(path)) |
9945d980 | 218 | return -1; |
9945d980 | 219 | |
d23748a6 | 220 | len = strlen(path); |
9945d980 | 221 | size = cache_entry_size(len); |
90321c10 | 222 | ce = xcalloc(1, size); |
9945d980 | 223 | |
e702496e | 224 | hashcpy(ce->sha1, sha1); |
d23748a6 JH |
225 | memcpy(ce->name, path, len); |
226 | ce->ce_flags = create_ce_flags(len, stage); | |
e4479470 | 227 | ce->ce_mode = create_ce_mode(mode); |
5f73076c | 228 | if (assume_unchanged) |
7a51ed66 | 229 | ce->ce_flags |= CE_VALID; |
192268c1 JH |
230 | option = allow_add ? ADD_CACHE_OK_TO_ADD : 0; |
231 | option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0; | |
caf4f582 JH |
232 | if (add_cache_entry(ce, option)) |
233 | return error("%s: cannot add to the index - missing --add option?", | |
d23748a6 JH |
234 | path); |
235 | report("add '%s'", path); | |
caf4f582 | 236 | return 0; |
9945d980 LT |
237 | } |
238 | ||
227bdb18 | 239 | static void chmod_path(int flip, const char *path) |
3e09cdfd JH |
240 | { |
241 | int pos; | |
242 | struct cache_entry *ce; | |
243 | unsigned int mode; | |
f2a19340 | 244 | |
3e09cdfd JH |
245 | pos = cache_name_pos(path, strlen(path)); |
246 | if (pos < 0) | |
227bdb18 | 247 | goto fail; |
3e09cdfd | 248 | ce = active_cache[pos]; |
7a51ed66 | 249 | mode = ce->ce_mode; |
3e09cdfd | 250 | if (!S_ISREG(mode)) |
227bdb18 | 251 | goto fail; |
3e09cdfd JH |
252 | switch (flip) { |
253 | case '+': | |
7a51ed66 | 254 | ce->ce_mode |= 0111; break; |
3e09cdfd | 255 | case '-': |
7a51ed66 | 256 | ce->ce_mode &= ~0111; break; |
3e09cdfd | 257 | default: |
227bdb18 | 258 | goto fail; |
3e09cdfd | 259 | } |
a6e5642f | 260 | cache_tree_invalidate_path(active_cache_tree, path); |
3e09cdfd | 261 | active_cache_changed = 1; |
227bdb18 AR |
262 | report("chmod %cx '%s'", flip, path); |
263 | return; | |
264 | fail: | |
265 | die("git-update-index: cannot chmod %cx '%s'", flip, path); | |
3e09cdfd JH |
266 | } |
267 | ||
ee1bec3d JH |
268 | static void update_one(const char *path, const char *prefix, int prefix_length) |
269 | { | |
270 | const char *p = prefix_path(prefix, prefix_length, path); | |
271 | if (!verify_path(p)) { | |
272 | fprintf(stderr, "Ignoring path %s\n", path); | |
fb69a760 | 273 | goto free_return; |
ee1bec3d | 274 | } |
5f73076c JH |
275 | if (mark_valid_only) { |
276 | if (mark_valid(p)) | |
277 | die("Unable to mark file %s", path); | |
fb69a760 | 278 | goto free_return; |
5f73076c JH |
279 | } |
280 | ||
ee1bec3d JH |
281 | if (force_remove) { |
282 | if (remove_file_from_cache(p)) | |
283 | die("git-update-index: unable to remove %s", path); | |
caf4f582 | 284 | report("remove '%s'", path); |
fb69a760 | 285 | goto free_return; |
ee1bec3d | 286 | } |
e011054b LT |
287 | if (process_path(p)) |
288 | die("Unable to process path %s", path); | |
caf4f582 | 289 | report("add '%s'", path); |
fb69a760 | 290 | free_return: |
0cc9e70c | 291 | if (p < path || p > path + strlen(path)) |
fb69a760 | 292 | free((char*)p); |
ee1bec3d JH |
293 | } |
294 | ||
d4dbf36d JH |
295 | static void read_index_info(int line_termination) |
296 | { | |
297 | struct strbuf buf; | |
7fb1011e PH |
298 | struct strbuf uq; |
299 | ||
f1696ee3 | 300 | strbuf_init(&buf, 0); |
7fb1011e PH |
301 | strbuf_init(&uq, 0); |
302 | while (strbuf_getline(&buf, stdin, line_termination) != EOF) { | |
9c20a470 | 303 | char *ptr, *tab; |
973d6a20 | 304 | char *path_name; |
d4dbf36d JH |
305 | unsigned char sha1[20]; |
306 | unsigned int mode; | |
6aead43d | 307 | unsigned long ul; |
d23748a6 JH |
308 | int stage; |
309 | ||
310 | /* This reads lines formatted in one of three formats: | |
311 | * | |
312 | * (1) mode SP sha1 TAB path | |
313 | * The first format is what "git-apply --index-info" | |
314 | * reports, and used to reconstruct a partial tree | |
315 | * that is used for phony merge base tree when falling | |
316 | * back on 3-way merge. | |
317 | * | |
318 | * (2) mode SP type SP sha1 TAB path | |
319 | * The second format is to stuff git-ls-tree output | |
320 | * into the index file. | |
fefe81c9 | 321 | * |
d23748a6 JH |
322 | * (3) mode SP sha1 SP stage TAB path |
323 | * This format is to put higher order stages into the | |
324 | * index file and matches git-ls-files --stage output. | |
325 | */ | |
6aead43d JM |
326 | errno = 0; |
327 | ul = strtoul(buf.buf, &ptr, 8); | |
328 | if (ptr == buf.buf || *ptr != ' ' | |
329 | || errno || (unsigned int) ul != ul) | |
d4dbf36d | 330 | goto bad_line; |
6aead43d | 331 | mode = ul; |
d4dbf36d | 332 | |
9c20a470 JH |
333 | tab = strchr(ptr, '\t'); |
334 | if (!tab || tab - ptr < 41) | |
335 | goto bad_line; | |
d23748a6 | 336 | |
2d497115 | 337 | if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') { |
d23748a6 JH |
338 | stage = tab[-1] - '0'; |
339 | ptr = tab + 1; /* point at the head of path */ | |
340 | tab = tab - 2; /* point at tail of sha1 */ | |
341 | } | |
342 | else { | |
343 | stage = 0; | |
344 | ptr = tab + 1; /* point at the head of path */ | |
345 | } | |
346 | ||
9c20a470 JH |
347 | if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ') |
348 | goto bad_line; | |
973d6a20 | 349 | |
7fb1011e PH |
350 | path_name = ptr; |
351 | if (line_termination && path_name[0] == '"') { | |
352 | strbuf_reset(&uq); | |
353 | if (unquote_c_style(&uq, path_name, NULL)) { | |
354 | die("git-update-index: bad quoting of path name"); | |
355 | } | |
356 | path_name = uq.buf; | |
357 | } | |
973d6a20 JH |
358 | |
359 | if (!verify_path(path_name)) { | |
360 | fprintf(stderr, "Ignoring path %s\n", path_name); | |
d4dbf36d JH |
361 | continue; |
362 | } | |
363 | ||
364 | if (!mode) { | |
365 | /* mode == 0 means there is no such path -- remove */ | |
973d6a20 | 366 | if (remove_file_from_cache(path_name)) |
d4dbf36d JH |
367 | die("git-update-index: unable to remove %s", |
368 | ptr); | |
369 | } | |
370 | else { | |
371 | /* mode ' ' sha1 '\t' name | |
372 | * ptr[-1] points at tab, | |
373 | * ptr[-41] is at the beginning of sha1 | |
374 | */ | |
375 | ptr[-42] = ptr[-1] = 0; | |
d23748a6 | 376 | if (add_cacheinfo(mode, sha1, path_name, stage)) |
d4dbf36d | 377 | die("git-update-index: unable to update %s", |
973d6a20 | 378 | path_name); |
d4dbf36d JH |
379 | } |
380 | continue; | |
381 | ||
382 | bad_line: | |
383 | die("malformed index info %s", buf.buf); | |
384 | } | |
e6c019d0 | 385 | strbuf_release(&buf); |
7fb1011e | 386 | strbuf_release(&uq); |
d4dbf36d JH |
387 | } |
388 | ||
f6ab5bb2 | 389 | static const char update_index_usage[] = |
7099c9c7 | 390 | "git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] <file>..."; |
f6ab5bb2 | 391 | |
2bd452d3 JH |
392 | static unsigned char head_sha1[20]; |
393 | static unsigned char merge_head_sha1[20]; | |
394 | ||
395 | static struct cache_entry *read_one_ent(const char *which, | |
396 | unsigned char *ent, const char *path, | |
397 | int namelen, int stage) | |
398 | { | |
399 | unsigned mode; | |
400 | unsigned char sha1[20]; | |
401 | int size; | |
402 | struct cache_entry *ce; | |
403 | ||
404 | if (get_tree_entry(ent, path, sha1, &mode)) { | |
83e77a25 JH |
405 | if (which) |
406 | error("%s: not in %s branch.", path, which); | |
2bd452d3 JH |
407 | return NULL; |
408 | } | |
409 | if (mode == S_IFDIR) { | |
83e77a25 JH |
410 | if (which) |
411 | error("%s: not a blob in %s branch.", path, which); | |
2bd452d3 JH |
412 | return NULL; |
413 | } | |
414 | size = cache_entry_size(namelen); | |
415 | ce = xcalloc(1, size); | |
416 | ||
e702496e | 417 | hashcpy(ce->sha1, sha1); |
2bd452d3 JH |
418 | memcpy(ce->name, path, namelen); |
419 | ce->ce_flags = create_ce_flags(namelen, stage); | |
420 | ce->ce_mode = create_ce_mode(mode); | |
421 | return ce; | |
422 | } | |
423 | ||
424 | static int unresolve_one(const char *path) | |
425 | { | |
426 | int namelen = strlen(path); | |
427 | int pos; | |
428 | int ret = 0; | |
429 | struct cache_entry *ce_2 = NULL, *ce_3 = NULL; | |
430 | ||
431 | /* See if there is such entry in the index. */ | |
432 | pos = cache_name_pos(path, namelen); | |
433 | if (pos < 0) { | |
434 | /* If there isn't, either it is unmerged, or | |
435 | * resolved as "removed" by mistake. We do not | |
436 | * want to do anything in the former case. | |
437 | */ | |
438 | pos = -pos-1; | |
439 | if (pos < active_nr) { | |
440 | struct cache_entry *ce = active_cache[pos]; | |
441 | if (ce_namelen(ce) == namelen && | |
442 | !memcmp(ce->name, path, namelen)) { | |
443 | fprintf(stderr, | |
444 | "%s: skipping still unmerged path.\n", | |
445 | path); | |
446 | goto free_return; | |
447 | } | |
448 | } | |
449 | } | |
450 | ||
451 | /* Grab blobs from given path from HEAD and MERGE_HEAD, | |
452 | * stuff HEAD version in stage #2, | |
453 | * stuff MERGE_HEAD version in stage #3. | |
454 | */ | |
455 | ce_2 = read_one_ent("our", head_sha1, path, namelen, 2); | |
456 | ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3); | |
457 | ||
458 | if (!ce_2 || !ce_3) { | |
459 | ret = -1; | |
460 | goto free_return; | |
461 | } | |
a89fccd2 | 462 | if (!hashcmp(ce_2->sha1, ce_3->sha1) && |
2bd452d3 JH |
463 | ce_2->ce_mode == ce_3->ce_mode) { |
464 | fprintf(stderr, "%s: identical in both, skipping.\n", | |
465 | path); | |
466 | goto free_return; | |
467 | } | |
468 | ||
469 | remove_file_from_cache(path); | |
470 | if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) { | |
471 | error("%s: cannot add our version to the index.", path); | |
472 | ret = -1; | |
473 | goto free_return; | |
474 | } | |
475 | if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD)) | |
476 | return 0; | |
477 | error("%s: cannot add their version to the index.", path); | |
478 | ret = -1; | |
479 | free_return: | |
480 | free(ce_2); | |
481 | free(ce_3); | |
482 | return ret; | |
483 | } | |
484 | ||
485 | static void read_head_pointers(void) | |
486 | { | |
913c983e | 487 | if (read_ref("HEAD", head_sha1)) |
2bd452d3 | 488 | die("No HEAD -- no initial commit yet?\n"); |
913c983e | 489 | if (read_ref("MERGE_HEAD", merge_head_sha1)) { |
2bd452d3 JH |
490 | fprintf(stderr, "Not in the middle of a merge.\n"); |
491 | exit(0); | |
492 | } | |
493 | } | |
494 | ||
09895c1f JH |
495 | static int do_unresolve(int ac, const char **av, |
496 | const char *prefix, int prefix_length) | |
2bd452d3 JH |
497 | { |
498 | int i; | |
499 | int err = 0; | |
500 | ||
501 | /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we | |
502 | * are not doing a merge, so exit with success status. | |
503 | */ | |
504 | read_head_pointers(); | |
505 | ||
506 | for (i = 1; i < ac; i++) { | |
507 | const char *arg = av[i]; | |
09895c1f JH |
508 | const char *p = prefix_path(prefix, prefix_length, arg); |
509 | err |= unresolve_one(p); | |
0cc9e70c | 510 | if (p < arg || p > arg + strlen(arg)) |
09895c1f | 511 | free((char*)p); |
2bd452d3 JH |
512 | } |
513 | return err; | |
514 | } | |
515 | ||
83e77a25 JH |
516 | static int do_reupdate(int ac, const char **av, |
517 | const char *prefix, int prefix_length) | |
518 | { | |
519 | /* Read HEAD and run update-index on paths that are | |
520 | * merged and already different between index and HEAD. | |
521 | */ | |
522 | int pos; | |
523 | int has_head = 1; | |
0cc9e70c | 524 | const char **pathspec = get_pathspec(prefix, av + 1); |
83e77a25 | 525 | |
913c983e | 526 | if (read_ref("HEAD", head_sha1)) |
83e77a25 JH |
527 | /* If there is no HEAD, that means it is an initial |
528 | * commit. Update everything in the index. | |
529 | */ | |
530 | has_head = 0; | |
531 | redo: | |
532 | for (pos = 0; pos < active_nr; pos++) { | |
533 | struct cache_entry *ce = active_cache[pos]; | |
534 | struct cache_entry *old = NULL; | |
535 | int save_nr; | |
22293b9c JH |
536 | |
537 | if (ce_stage(ce) || !ce_path_match(ce, pathspec)) | |
83e77a25 JH |
538 | continue; |
539 | if (has_head) | |
540 | old = read_one_ent(NULL, head_sha1, | |
541 | ce->name, ce_namelen(ce), 0); | |
542 | if (old && ce->ce_mode == old->ce_mode && | |
a89fccd2 | 543 | !hashcmp(ce->sha1, old->sha1)) { |
83e77a25 JH |
544 | free(old); |
545 | continue; /* unchanged */ | |
546 | } | |
547 | /* Be careful. The working tree may not have the | |
548 | * path anymore, in which case, under 'allow_remove', | |
549 | * or worse yet 'allow_replace', active_nr may decrease. | |
550 | */ | |
551 | save_nr = active_nr; | |
552 | update_one(ce->name + prefix_length, prefix, prefix_length); | |
553 | if (save_nr != active_nr) | |
554 | goto redo; | |
555 | } | |
556 | return 0; | |
557 | } | |
558 | ||
a633fca0 | 559 | int cmd_update_index(int argc, const char **argv, const char *prefix) |
e83c5163 | 560 | { |
ee1bec3d | 561 | int i, newfd, entries, has_errors = 0, line_termination = '\n'; |
121481ab | 562 | int allow_options = 1; |
ee1bec3d | 563 | int read_from_stdin = 0; |
ee1bec3d | 564 | int prefix_length = prefix ? strlen(prefix) : 0; |
227bdb18 | 565 | char set_executable_bit = 0; |
405e5b2f | 566 | unsigned int refresh_flags = 0; |
7b802b86 | 567 | int lock_error = 0; |
fefe81c9 | 568 | struct lock_file *lock_file; |
bb233d69 | 569 | |
ef90d6d4 | 570 | git_config(git_default_config, NULL); |
3e09cdfd | 571 | |
fefe81c9 | 572 | /* We can't free this memory, it becomes part of a linked list parsed atexit() */ |
928e47e3 | 573 | lock_file = xcalloc(1, sizeof(struct lock_file)); |
fefe81c9 | 574 | |
30ca07a2 | 575 | newfd = hold_locked_index(lock_file, 0); |
7b802b86 JH |
576 | if (newfd < 0) |
577 | lock_error = errno; | |
9614b8dc | 578 | |
e83c5163 | 579 | entries = read_cache(); |
9614b8dc | 580 | if (entries < 0) |
2de381f9 | 581 | die("cache corrupted"); |
e83c5163 | 582 | |
e83c5163 | 583 | for (i = 1 ; i < argc; i++) { |
6b5ee137 | 584 | const char *path = argv[i]; |
9ebe6cf9 | 585 | const char *p; |
121481ab LT |
586 | |
587 | if (allow_options && *path == '-') { | |
588 | if (!strcmp(path, "--")) { | |
589 | allow_options = 0; | |
590 | continue; | |
591 | } | |
0ed3715f | 592 | if (!strcmp(path, "-q")) { |
405e5b2f | 593 | refresh_flags |= REFRESH_QUIET; |
0ed3715f LT |
594 | continue; |
595 | } | |
5fdeacb0 JS |
596 | if (!strcmp(path, "--ignore-submodules")) { |
597 | refresh_flags |= REFRESH_IGNORE_SUBMODULES; | |
598 | continue; | |
599 | } | |
121481ab LT |
600 | if (!strcmp(path, "--add")) { |
601 | allow_add = 1; | |
602 | continue; | |
603 | } | |
192268c1 JH |
604 | if (!strcmp(path, "--replace")) { |
605 | allow_replace = 1; | |
606 | continue; | |
607 | } | |
121481ab LT |
608 | if (!strcmp(path, "--remove")) { |
609 | allow_remove = 1; | |
610 | continue; | |
611 | } | |
5d1a5c02 | 612 | if (!strcmp(path, "--unmerged")) { |
405e5b2f | 613 | refresh_flags |= REFRESH_UNMERGED; |
5d1a5c02 LT |
614 | continue; |
615 | } | |
121481ab | 616 | if (!strcmp(path, "--refresh")) { |
405e5b2f | 617 | has_errors |= refresh_cache(refresh_flags); |
5f73076c JH |
618 | continue; |
619 | } | |
620 | if (!strcmp(path, "--really-refresh")) { | |
405e5b2f | 621 | has_errors |= refresh_cache(REFRESH_REALLY | refresh_flags); |
121481ab LT |
622 | continue; |
623 | } | |
9945d980 | 624 | if (!strcmp(path, "--cacheinfo")) { |
d23748a6 JH |
625 | unsigned char sha1[20]; |
626 | unsigned int mode; | |
627 | ||
b3f94c4b | 628 | if (i+3 >= argc) |
215a7ad1 | 629 | die("git-update-index: --cacheinfo <mode> <sha1> <path>"); |
d23748a6 | 630 | |
6e6db39a | 631 | if (strtoul_ui(argv[i+1], 8, &mode) || |
d23748a6 JH |
632 | get_sha1_hex(argv[i+2], sha1) || |
633 | add_cacheinfo(mode, sha1, argv[i+3], 0)) | |
634 | die("git-update-index: --cacheinfo" | |
635 | " cannot add %s", argv[i+3]); | |
9945d980 LT |
636 | i += 3; |
637 | continue; | |
638 | } | |
3e09cdfd JH |
639 | if (!strcmp(path, "--chmod=-x") || |
640 | !strcmp(path, "--chmod=+x")) { | |
641 | if (argc <= i+1) | |
642 | die("git-update-index: %s <path>", path); | |
227bdb18 | 643 | set_executable_bit = path[8]; |
3e09cdfd JH |
644 | continue; |
645 | } | |
5f73076c JH |
646 | if (!strcmp(path, "--assume-unchanged")) { |
647 | mark_valid_only = MARK_VALID; | |
648 | continue; | |
649 | } | |
650 | if (!strcmp(path, "--no-assume-unchanged")) { | |
651 | mark_valid_only = UNMARK_VALID; | |
652 | continue; | |
653 | } | |
df6e1516 BL |
654 | if (!strcmp(path, "--info-only")) { |
655 | info_only = 1; | |
656 | continue; | |
657 | } | |
0ff5bf7c | 658 | if (!strcmp(path, "--force-remove")) { |
9b63f501 | 659 | force_remove = 1; |
0ff5bf7c JH |
660 | continue; |
661 | } | |
ee1bec3d JH |
662 | if (!strcmp(path, "-z")) { |
663 | line_termination = 0; | |
664 | continue; | |
665 | } | |
666 | if (!strcmp(path, "--stdin")) { | |
667 | if (i != argc - 1) | |
668 | die("--stdin must be at the end"); | |
669 | read_from_stdin = 1; | |
670 | break; | |
671 | } | |
d4dbf36d | 672 | if (!strcmp(path, "--index-info")) { |
a41c175d SP |
673 | if (i != argc - 1) |
674 | die("--index-info must be at the end"); | |
d4dbf36d JH |
675 | allow_add = allow_replace = allow_remove = 1; |
676 | read_index_info(line_termination); | |
a41c175d | 677 | break; |
d4dbf36d | 678 | } |
2bd452d3 | 679 | if (!strcmp(path, "--unresolve")) { |
09895c1f JH |
680 | has_errors = do_unresolve(argc - i, argv + i, |
681 | prefix, prefix_length); | |
2bd452d3 JH |
682 | if (has_errors) |
683 | active_cache_changed = 0; | |
684 | goto finish; | |
685 | } | |
7099c9c7 | 686 | if (!strcmp(path, "--again") || !strcmp(path, "-g")) { |
83e77a25 JH |
687 | has_errors = do_reupdate(argc - i, argv + i, |
688 | prefix, prefix_length); | |
689 | if (has_errors) | |
690 | active_cache_changed = 0; | |
691 | goto finish; | |
692 | } | |
c6e007b0 | 693 | if (!strcmp(path, "--ignore-missing")) { |
405e5b2f | 694 | refresh_flags |= REFRESH_IGNORE_MISSING; |
c6e007b0 JB |
695 | continue; |
696 | } | |
caf4f582 JH |
697 | if (!strcmp(path, "--verbose")) { |
698 | verbose = 1; | |
699 | continue; | |
700 | } | |
f6ab5bb2 PB |
701 | if (!strcmp(path, "-h") || !strcmp(path, "--help")) |
702 | usage(update_index_usage); | |
2de381f9 | 703 | die("unknown option %s", path); |
121481ab | 704 | } |
9ebe6cf9 AR |
705 | p = prefix_path(prefix, prefix_length, path); |
706 | update_one(p, NULL, 0); | |
227bdb18 | 707 | if (set_executable_bit) |
9ebe6cf9 AR |
708 | chmod_path(set_executable_bit, p); |
709 | if (p < path || p > path + strlen(path)) | |
710 | free((char*)p); | |
ee1bec3d JH |
711 | } |
712 | if (read_from_stdin) { | |
7fb1011e PH |
713 | struct strbuf buf, nbuf; |
714 | ||
f1696ee3 | 715 | strbuf_init(&buf, 0); |
7fb1011e PH |
716 | strbuf_init(&nbuf, 0); |
717 | while (strbuf_getline(&buf, stdin, line_termination) != EOF) { | |
fb69a760 | 718 | const char *p; |
7fb1011e PH |
719 | if (line_termination && buf.buf[0] == '"') { |
720 | strbuf_reset(&nbuf); | |
721 | if (unquote_c_style(&nbuf, buf.buf, NULL)) | |
722 | die("line is badly quoted"); | |
723 | strbuf_swap(&buf, &nbuf); | |
724 | } | |
725 | p = prefix_path(prefix, prefix_length, buf.buf); | |
fb69a760 JH |
726 | update_one(p, NULL, 0); |
727 | if (set_executable_bit) | |
227bdb18 | 728 | chmod_path(set_executable_bit, p); |
7fb1011e PH |
729 | if (p < buf.buf || p > buf.buf + buf.len) |
730 | free((char *)p); | |
9b63f501 | 731 | } |
7fb1011e | 732 | strbuf_release(&nbuf); |
e6c019d0 | 733 | strbuf_release(&buf); |
e83c5163 | 734 | } |
2bd452d3 JH |
735 | |
736 | finish: | |
5cd5ace7 | 737 | if (active_cache_changed) { |
7b802b86 JH |
738 | if (newfd < 0) { |
739 | if (refresh_flags & REFRESH_QUIET) | |
740 | exit(128); | |
741 | die("unable to create '%s.lock': %s", | |
742 | get_index_file(), strerror(lock_error)); | |
743 | } | |
5cd5ace7 | 744 | if (write_cache(newfd, active_cache, active_nr) || |
4ed7cd3a | 745 | commit_locked_index(lock_file)) |
021b6e45 | 746 | die("Unable to write new index file"); |
5cd5ace7 | 747 | } |
9614b8dc | 748 | |
fefe81c9 LS |
749 | rollback_lock_file(lock_file); |
750 | ||
c4b83e61 | 751 | return has_errors ? 1 : 0; |
e83c5163 | 752 | } |