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