1#define NO_THE_INDEX_COMPATIBILITY_MACROS 2#include "cache.h" 3#include "dir.h" 4#include "tree.h" 5#include "tree-walk.h" 6#include "cache-tree.h" 7#include "unpack-trees.h" 8#include "progress.h" 9#include "refs.h" 10#include "attr.h" 11 12/* 13 * Error messages expected by scripts out of plumbing commands such as 14 * read-tree. Non-scripted Porcelain is not required to use these messages 15 * and in fact are encouraged to reword them to better suit their particular 16 * situation better. See how "git checkout" and "git merge" replaces 17 * them using setup_unpack_trees_porcelain(), for example. 18 */ 19const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { 20 /* ERROR_WOULD_OVERWRITE */ 21 "Entry '%s' would be overwritten by merge. Cannot merge.", 22 23 /* ERROR_NOT_UPTODATE_FILE */ 24 "Entry '%s' not uptodate. Cannot merge.", 25 26 /* ERROR_NOT_UPTODATE_DIR */ 27 "Updating '%s' would lose untracked files in it", 28 29 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */ 30 "Untracked working tree file '%s' would be overwritten by merge.", 31 32 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */ 33 "Untracked working tree file '%s' would be removed by merge.", 34 35 /* ERROR_BIND_OVERLAP */ 36 "Entry '%s' overlaps with '%s'. Cannot bind.", 37 38 /* ERROR_SPARSE_NOT_UPTODATE_FILE */ 39 "Entry '%s' not uptodate. Cannot update sparse checkout.", 40 41 /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ 42 "Working tree file '%s' would be overwritten by sparse checkout update.", 43 44 /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */ 45 "Working tree file '%s' would be removed by sparse checkout update.", 46}; 47 48#define ERRORMSG(o,type) \ 49 ( ((o) && (o)->msgs[(type)]) \ 50 ? ((o)->msgs[(type)]) \ 51 : (unpack_plumbing_errors[(type)]) ) 52 53void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, 54 const char *cmd) 55{ 56 int i; 57 const char **msgs = opts->msgs; 58 const char *msg; 59 char *tmp; 60 const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches"; 61 if (advice_commit_before_merge) 62 msg = "Your local changes to the following files would be overwritten by %s:\n%%s" 63 "Please, commit your changes or stash them before you can %s."; 64 else 65 msg = "Your local changes to the following files would be overwritten by %s:\n%%s"; 66 tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen(cmd2) - 2); 67 sprintf(tmp, msg, cmd, cmd2); 68 msgs[ERROR_WOULD_OVERWRITE] = tmp; 69 msgs[ERROR_NOT_UPTODATE_FILE] = tmp; 70 71 msgs[ERROR_NOT_UPTODATE_DIR] = 72 "Updating the following directories would lose untracked files in it:\n%s"; 73 74 if (advice_commit_before_merge) 75 msg = "The following untracked working tree files would be %s by %s:\n%%s" 76 "Please move or remove them before you can %s."; 77 else 78 msg = "The following untracked working tree files would be %s by %s:\n%%s"; 79 tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("removed") + strlen(cmd2) - 4); 80 sprintf(tmp, msg, "removed", cmd, cmd2); 81 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = tmp; 82 tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("overwritten") + strlen(cmd2) - 4); 83 sprintf(tmp, msg, "overwritten", cmd, cmd2); 84 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = tmp; 85 86 /* 87 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we 88 * cannot easily display it as a list. 89 */ 90 msgs[ERROR_BIND_OVERLAP] = "Entry '%s' overlaps with '%s'. Cannot bind."; 91 92 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = 93 "Cannot update sparse checkout: the following entries are not up-to-date:\n%s"; 94 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = 95 "The following Working tree files would be overwritten by sparse checkout update:\n%s"; 96 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = 97 "The following Working tree files would be removed by sparse checkout update:\n%s"; 98 99 opts->show_all_errors = 1; 100 /* rejected paths may not have a static buffer */ 101 for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++) 102 opts->unpack_rejects[i].strdup_strings = 1; 103} 104 105static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce, 106 unsigned int set, unsigned int clear) 107{ 108 unsigned int size = ce_size(ce); 109 struct cache_entry *new = xmalloc(size); 110 111 clear |= CE_HASHED | CE_UNHASHED; 112 113 if (set & CE_REMOVE) 114 set |= CE_WT_REMOVE; 115 116 memcpy(new, ce, size); 117 new->next = NULL; 118 new->ce_flags = (new->ce_flags & ~clear) | set; 119 add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); 120} 121 122/* 123 * add error messages on path <path> 124 * corresponding to the type <e> with the message <msg> 125 * indicating if it should be display in porcelain or not 126 */ 127static int add_rejected_path(struct unpack_trees_options *o, 128 enum unpack_trees_error_types e, 129 const char *path) 130{ 131 if (!o->show_all_errors) 132 return error(ERRORMSG(o, e), path); 133 134 /* 135 * Otherwise, insert in a list for future display by 136 * display_error_msgs() 137 */ 138 string_list_append(&o->unpack_rejects[e], path); 139 return -1; 140} 141 142/* 143 * display all the error messages stored in a nice way 144 */ 145static void display_error_msgs(struct unpack_trees_options *o) 146{ 147 int e, i; 148 int something_displayed = 0; 149 for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { 150 struct string_list *rejects = &o->unpack_rejects[e]; 151 if (rejects->nr > 0) { 152 struct strbuf path = STRBUF_INIT; 153 something_displayed = 1; 154 for (i = 0; i < rejects->nr; i++) 155 strbuf_addf(&path, "\t%s\n", rejects->items[i].string); 156 error(ERRORMSG(o, e), path.buf); 157 strbuf_release(&path); 158 } 159 string_list_clear(rejects, 0); 160 } 161 if (something_displayed) 162 printf("Aborting\n"); 163} 164 165/* 166 * Unlink the last component and schedule the leading directories for 167 * removal, such that empty directories get removed. 168 */ 169static void unlink_entry(struct cache_entry *ce) 170{ 171 if (!check_leading_path(ce->name, ce_namelen(ce))) 172 return; 173 if (remove_or_warn(ce->ce_mode, ce->name)) 174 return; 175 schedule_dir_for_removal(ce->name, ce_namelen(ce)); 176} 177 178static struct checkout state; 179static int check_updates(struct unpack_trees_options *o) 180{ 181 unsigned cnt = 0, total = 0; 182 struct progress *progress = NULL; 183 struct index_state *index = &o->result; 184 int i; 185 int errs = 0; 186 187 if (o->update && o->verbose_update) { 188 for (total = cnt = 0; cnt < index->cache_nr; cnt++) { 189 struct cache_entry *ce = index->cache[cnt]; 190 if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE)) 191 total++; 192 } 193 194 progress = start_progress_delay("Checking out files", 195 total, 50, 1); 196 cnt = 0; 197 } 198 199 if (o->update) 200 git_attr_set_direction(GIT_ATTR_CHECKOUT, &o->result); 201 for (i = 0; i < index->cache_nr; i++) { 202 struct cache_entry *ce = index->cache[i]; 203 204 if (ce->ce_flags & CE_WT_REMOVE) { 205 display_progress(progress, ++cnt); 206 if (o->update) 207 unlink_entry(ce); 208 continue; 209 } 210 } 211 remove_marked_cache_entries(&o->result); 212 remove_scheduled_dirs(); 213 214 for (i = 0; i < index->cache_nr; i++) { 215 struct cache_entry *ce = index->cache[i]; 216 217 if (ce->ce_flags & CE_UPDATE) { 218 display_progress(progress, ++cnt); 219 ce->ce_flags &= ~CE_UPDATE; 220 if (o->update) { 221 errs |= checkout_entry(ce, &state, NULL); 222 } 223 } 224 } 225 stop_progress(&progress); 226 if (o->update) 227 git_attr_set_direction(GIT_ATTR_CHECKIN, NULL); 228 return errs != 0; 229} 230 231static int verify_uptodate_sparse(struct cache_entry *ce, struct unpack_trees_options *o); 232static int verify_absent_sparse(struct cache_entry *ce, enum unpack_trees_error_types, struct unpack_trees_options *o); 233 234static int apply_sparse_checkout(struct cache_entry *ce, struct unpack_trees_options *o) 235{ 236 int was_skip_worktree = ce_skip_worktree(ce); 237 238 if (ce->ce_flags & CE_NEW_SKIP_WORKTREE) 239 ce->ce_flags |= CE_SKIP_WORKTREE; 240 else 241 ce->ce_flags &= ~CE_SKIP_WORKTREE; 242 243 /* 244 * if (!was_skip_worktree && !ce_skip_worktree()) { 245 * This is perfectly normal. Move on; 246 * } 247 */ 248 249 /* 250 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout 251 * area as a result of ce_skip_worktree() shortcuts in 252 * verify_absent() and verify_uptodate(). 253 * Make sure they don't modify worktree if they are already 254 * outside checkout area 255 */ 256 if (was_skip_worktree && ce_skip_worktree(ce)) { 257 ce->ce_flags &= ~CE_UPDATE; 258 259 /* 260 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also 261 * on to get that file removed from both index and worktree. 262 * If that file is already outside worktree area, don't 263 * bother remove it. 264 */ 265 if (ce->ce_flags & CE_REMOVE) 266 ce->ce_flags &= ~CE_WT_REMOVE; 267 } 268 269 if (!was_skip_worktree && ce_skip_worktree(ce)) { 270 /* 271 * If CE_UPDATE is set, verify_uptodate() must be called already 272 * also stat info may have lost after merged_entry() so calling 273 * verify_uptodate() again may fail 274 */ 275 if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o)) 276 return -1; 277 ce->ce_flags |= CE_WT_REMOVE; 278 } 279 if (was_skip_worktree && !ce_skip_worktree(ce)) { 280 if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) 281 return -1; 282 ce->ce_flags |= CE_UPDATE; 283 } 284 return 0; 285} 286 287static inline int call_unpack_fn(struct cache_entry **src, struct unpack_trees_options *o) 288{ 289 int ret = o->fn(src, o); 290 if (ret > 0) 291 ret = 0; 292 return ret; 293} 294 295static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o) 296{ 297 ce->ce_flags |= CE_UNPACKED; 298 299 if (o->cache_bottom < o->src_index->cache_nr && 300 o->src_index->cache[o->cache_bottom] == ce) { 301 int bottom = o->cache_bottom; 302 while (bottom < o->src_index->cache_nr && 303 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) 304 bottom++; 305 o->cache_bottom = bottom; 306 } 307} 308 309static void mark_all_ce_unused(struct index_state *index) 310{ 311 int i; 312 for (i = 0; i < index->cache_nr; i++) 313 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE); 314} 315 316static int locate_in_src_index(struct cache_entry *ce, 317 struct unpack_trees_options *o) 318{ 319 struct index_state *index = o->src_index; 320 int len = ce_namelen(ce); 321 int pos = index_name_pos(index, ce->name, len); 322 if (pos < 0) 323 pos = -1 - pos; 324 return pos; 325} 326 327/* 328 * We call unpack_index_entry() with an unmerged cache entry 329 * only in diff-index, and it wants a single callback. Skip 330 * the other unmerged entry with the same name. 331 */ 332static void mark_ce_used_same_name(struct cache_entry *ce, 333 struct unpack_trees_options *o) 334{ 335 struct index_state *index = o->src_index; 336 int len = ce_namelen(ce); 337 int pos; 338 339 for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { 340 struct cache_entry *next = index->cache[pos]; 341 if (len != ce_namelen(next) || 342 memcmp(ce->name, next->name, len)) 343 break; 344 mark_ce_used(next, o); 345 } 346} 347 348static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) 349{ 350 const struct index_state *index = o->src_index; 351 int pos = o->cache_bottom; 352 353 while (pos < index->cache_nr) { 354 struct cache_entry *ce = index->cache[pos]; 355 if (!(ce->ce_flags & CE_UNPACKED)) 356 return ce; 357 pos++; 358 } 359 return NULL; 360} 361 362static void add_same_unmerged(struct cache_entry *ce, 363 struct unpack_trees_options *o) 364{ 365 struct index_state *index = o->src_index; 366 int len = ce_namelen(ce); 367 int pos = index_name_pos(index, ce->name, len); 368 369 if (0 <= pos) 370 die("programming error in a caller of mark_ce_used_same_name"); 371 for (pos = -pos - 1; pos < index->cache_nr; pos++) { 372 struct cache_entry *next = index->cache[pos]; 373 if (len != ce_namelen(next) || 374 memcmp(ce->name, next->name, len)) 375 break; 376 add_entry(o, next, 0, 0); 377 mark_ce_used(next, o); 378 } 379} 380 381static int unpack_index_entry(struct cache_entry *ce, 382 struct unpack_trees_options *o) 383{ 384 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; 385 int ret; 386 387 src[0] = ce; 388 389 mark_ce_used(ce, o); 390 if (ce_stage(ce)) { 391 if (o->skip_unmerged) { 392 add_entry(o, ce, 0, 0); 393 return 0; 394 } 395 } 396 ret = call_unpack_fn(src, o); 397 if (ce_stage(ce)) 398 mark_ce_used_same_name(ce, o); 399 return ret; 400} 401 402static int find_cache_pos(struct traverse_info *, const struct name_entry *); 403 404static void restore_cache_bottom(struct traverse_info *info, int bottom) 405{ 406 struct unpack_trees_options *o = info->data; 407 408 if (o->diff_index_cached) 409 return; 410 o->cache_bottom = bottom; 411} 412 413static int switch_cache_bottom(struct traverse_info *info) 414{ 415 struct unpack_trees_options *o = info->data; 416 int ret, pos; 417 418 if (o->diff_index_cached) 419 return 0; 420 ret = o->cache_bottom; 421 pos = find_cache_pos(info->prev, &info->name); 422 423 if (pos < -1) 424 o->cache_bottom = -2 - pos; 425 else if (pos < 0) 426 o->cache_bottom = o->src_index->cache_nr; 427 return ret; 428} 429 430static int fast_forward_merge(int n, unsigned long dirmask, 431 struct name_entry *names, 432 struct traverse_info *info); 433 434static int traverse_trees_recursive(int n, unsigned long dirmask, 435 unsigned long df_conflicts, 436 struct name_entry *names, 437 struct traverse_info *info) 438{ 439 int i, ret, bottom; 440 struct tree_desc t[MAX_UNPACK_TREES]; 441 void *buf[MAX_UNPACK_TREES]; 442 struct traverse_info newinfo; 443 struct name_entry *p; 444 445 if (!df_conflicts) { 446 int status = fast_forward_merge(n, dirmask, names, info); 447 if (status) 448 return status; 449 } 450 p = names; 451 while (!p->mode) 452 p++; 453 454 newinfo = *info; 455 newinfo.prev = info; 456 newinfo.name = *p; 457 newinfo.pathlen += tree_entry_len(p->path, p->sha1) + 1; 458 newinfo.conflicts |= df_conflicts; 459 460 for (i = 0; i < n; i++, dirmask >>= 1) { 461 const unsigned char *sha1 = NULL; 462 if (dirmask & 1) 463 sha1 = names[i].sha1; 464 buf[i] = fill_tree_descriptor(t+i, sha1); 465 } 466 467 bottom = switch_cache_bottom(&newinfo); 468 ret = traverse_trees(n, t, &newinfo); 469 restore_cache_bottom(&newinfo, bottom); 470 471 for (i = 0; i < n; i++) 472 free(buf[i]); 473 474 return ret; 475} 476 477/* 478 * Compare the traverse-path to the cache entry without actually 479 * having to generate the textual representation of the traverse 480 * path. 481 * 482 * NOTE! This *only* compares up to the size of the traverse path 483 * itself - the caller needs to do the final check for the cache 484 * entry having more data at the end! 485 */ 486static int do_compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n) 487{ 488 int len, pathlen, ce_len; 489 const char *ce_name; 490 491 if (info->prev) { 492 int cmp = do_compare_entry(ce, info->prev, &info->name); 493 if (cmp) 494 return cmp; 495 } 496 pathlen = info->pathlen; 497 ce_len = ce_namelen(ce); 498 499 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */ 500 if (ce_len < pathlen) 501 return -1; 502 503 ce_len -= pathlen; 504 ce_name = ce->name + pathlen; 505 506 len = tree_entry_len(n->path, n->sha1); 507 return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 508} 509 510static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n) 511{ 512 int cmp = do_compare_entry(ce, info, n); 513 if (cmp) 514 return cmp; 515 516 /* 517 * Even if the beginning compared identically, the ce should 518 * compare as bigger than a directory leading up to it! 519 */ 520 return ce_namelen(ce) > traverse_path_len(info, n); 521} 522 523static int ce_in_traverse_path(const struct cache_entry *ce, 524 const struct traverse_info *info) 525{ 526 if (!info->prev) 527 return 1; 528 if (do_compare_entry(ce, info->prev, &info->name)) 529 return 0; 530 /* 531 * If ce (blob) is the same name as the path (which is a tree 532 * we will be descending into), it won't be inside it. 533 */ 534 return (info->pathlen < ce_namelen(ce)); 535} 536 537static struct cache_entry *create_ce_entry(const struct traverse_info *info, const struct name_entry *n, int stage) 538{ 539 int len = traverse_path_len(info, n); 540 struct cache_entry *ce = xcalloc(1, cache_entry_size(len)); 541 542 ce->ce_mode = create_ce_mode(n->mode); 543 ce->ce_flags = create_ce_flags(len, stage); 544 hashcpy(ce->sha1, n->sha1); 545 make_traverse_path(ce->name, info, n); 546 547 return ce; 548} 549 550static int unpack_nondirectories(int n, unsigned long mask, 551 unsigned long dirmask, 552 struct cache_entry **src, 553 const struct name_entry *names, 554 const struct traverse_info *info) 555{ 556 int i; 557 struct unpack_trees_options *o = info->data; 558 unsigned long conflicts; 559 560 /* Do we have *only* directories? Nothing to do */ 561 if (mask == dirmask && !src[0]) 562 return 0; 563 564 conflicts = info->conflicts; 565 if (o->merge) 566 conflicts >>= 1; 567 conflicts |= dirmask; 568 569 /* 570 * Ok, we've filled in up to any potential index entry in src[0], 571 * now do the rest. 572 */ 573 for (i = 0; i < n; i++) { 574 int stage; 575 unsigned int bit = 1ul << i; 576 if (conflicts & bit) { 577 src[i + o->merge] = o->df_conflict_entry; 578 continue; 579 } 580 if (!(mask & bit)) 581 continue; 582 if (!o->merge) 583 stage = 0; 584 else if (i + 1 < o->head_idx) 585 stage = 1; 586 else if (i + 1 > o->head_idx) 587 stage = 3; 588 else 589 stage = 2; 590 src[i + o->merge] = create_ce_entry(info, names + i, stage); 591 } 592 593 if (o->merge) 594 return call_unpack_fn(src, o); 595 596 for (i = 0; i < n; i++) 597 if (src[i] && src[i] != o->df_conflict_entry) 598 add_entry(o, src[i], 0, 0); 599 return 0; 600} 601 602static int unpack_failed(struct unpack_trees_options *o, const char *message) 603{ 604 discard_index(&o->result); 605 if (!o->gently) { 606 if (message) 607 return error("%s", message); 608 return -1; 609 } 610 return -1; 611} 612 613/* NEEDSWORK: give this a better name and share with tree-walk.c */ 614static int name_compare(const char *a, int a_len, 615 const char *b, int b_len) 616{ 617 int len = (a_len < b_len) ? a_len : b_len; 618 int cmp = memcmp(a, b, len); 619 if (cmp) 620 return cmp; 621 return (a_len - b_len); 622} 623 624/* 625 * The tree traversal is looking at name p. If we have a matching entry, 626 * return it. If name p is a directory in the index, do not return 627 * anything, as we will want to match it when the traversal descends into 628 * the directory. 629 */ 630static int find_cache_pos(struct traverse_info *info, 631 const struct name_entry *p) 632{ 633 int pos; 634 struct unpack_trees_options *o = info->data; 635 struct index_state *index = o->src_index; 636 int pfxlen = info->pathlen; 637 int p_len = tree_entry_len(p->path, p->sha1); 638 639 for (pos = o->cache_bottom; pos < index->cache_nr; pos++) { 640 struct cache_entry *ce = index->cache[pos]; 641 const char *ce_name, *ce_slash; 642 int cmp, ce_len; 643 644 if (ce->ce_flags & CE_UNPACKED) { 645 /* 646 * cache_bottom entry is already unpacked, so 647 * we can never match it; don't check it 648 * again. 649 */ 650 if (pos == o->cache_bottom) 651 ++o->cache_bottom; 652 continue; 653 } 654 if (!ce_in_traverse_path(ce, info)) 655 continue; 656 ce_name = ce->name + pfxlen; 657 ce_slash = strchr(ce_name, '/'); 658 if (ce_slash) 659 ce_len = ce_slash - ce_name; 660 else 661 ce_len = ce_namelen(ce) - pfxlen; 662 cmp = name_compare(p->path, p_len, ce_name, ce_len); 663 /* 664 * Exact match; if we have a directory we need to 665 * delay returning it. 666 */ 667 if (!cmp) 668 return ce_slash ? -2 - pos : pos; 669 if (0 < cmp) 670 continue; /* keep looking */ 671 /* 672 * ce_name sorts after p->path; could it be that we 673 * have files under p->path directory in the index? 674 * E.g. ce_name == "t-i", and p->path == "t"; we may 675 * have "t/a" in the index. 676 */ 677 if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) && 678 ce_name[p_len] < '/') 679 continue; /* keep looking */ 680 break; 681 } 682 return -1; 683} 684 685static struct cache_entry *find_cache_entry(struct traverse_info *info, 686 const struct name_entry *p) 687{ 688 int pos = find_cache_pos(info, p); 689 struct unpack_trees_options *o = info->data; 690 691 if (0 <= pos) 692 return o->src_index->cache[pos]; 693 else 694 return NULL; 695} 696 697static int fast_forward_merge(int n, unsigned long dirmask, 698 struct name_entry *names, 699 struct traverse_info *info) 700{ 701 int i; 702 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; 703 struct unpack_trees_options *o = info->data; 704 705 /* merging two or more trees with an identical subdirectory? */ 706 if ((n < 2) || ((1UL << n) - 1) != dirmask || 707 !o->merge || o->reset || o->initial_checkout) 708 return 0; 709 for (i = 1; i < n; i++) 710 if (hashcmp(names[i-1].sha1, names[i].sha1)) 711 return 0; 712 713 /* 714 * Instead of descending into the directory, keep the contents 715 * of the current index. 716 */ 717 while (1) { 718 struct cache_entry *ce; 719 ce = next_cache_entry(o); 720 if (!ce) 721 break; 722 /* Is the entry still in that directory? */ 723 if (do_compare_entry(ce, info, names)) 724 break; 725 /* 726 * Note: we do not just run unpack_index_entry() here, 727 * as the callback may want to compare what is in the 728 * index with what are from the HEAD and the other tree 729 * and reject the merge. We pretend that ancestors, the 730 * HEAD and the other tree all have the same contents as 731 * the current index, which is a lie, but it works. 732 */ 733 for (i = 0; i < n + 1; i++) 734 src[i] = ce; 735 mark_ce_used(ce, o); 736 if (call_unpack_fn(src, o) < 0) 737 return unpack_failed(o, NULL); 738 if (ce_stage(ce)) 739 mark_ce_used_same_name(ce, o); 740 } 741 return dirmask; 742} 743 744static void debug_path(struct traverse_info *info) 745{ 746 if (info->prev) { 747 debug_path(info->prev); 748 if (*info->prev->name.path) 749 putchar('/'); 750 } 751 printf("%s", info->name.path); 752} 753 754static void debug_name_entry(int i, struct name_entry *n) 755{ 756 printf("ent#%d %06o %s\n", i, 757 n->path ? n->mode : 0, 758 n->path ? n->path : "(missing)"); 759} 760 761static void debug_unpack_callback(int n, 762 unsigned long mask, 763 unsigned long dirmask, 764 struct name_entry *names, 765 struct traverse_info *info) 766{ 767 int i; 768 printf("* unpack mask %lu, dirmask %lu, cnt %d ", 769 mask, dirmask, n); 770 debug_path(info); 771 putchar('\n'); 772 for (i = 0; i < n; i++) 773 debug_name_entry(i, names + i); 774} 775 776static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info) 777{ 778 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; 779 struct unpack_trees_options *o = info->data; 780 const struct name_entry *p = names; 781 782 /* Find first entry with a real name (we could use "mask" too) */ 783 while (!p->mode) 784 p++; 785 786 if (o->debug_unpack) 787 debug_unpack_callback(n, mask, dirmask, names, info); 788 789 /* Are we supposed to look at the index too? */ 790 if (o->merge) { 791 while (1) { 792 int cmp; 793 struct cache_entry *ce; 794 795 if (o->diff_index_cached) 796 ce = next_cache_entry(o); 797 else 798 ce = find_cache_entry(info, p); 799 800 if (!ce) 801 break; 802 cmp = compare_entry(ce, info, p); 803 if (cmp < 0) { 804 if (unpack_index_entry(ce, o) < 0) 805 return unpack_failed(o, NULL); 806 continue; 807 } 808 if (!cmp) { 809 if (ce_stage(ce)) { 810 /* 811 * If we skip unmerged index 812 * entries, we'll skip this 813 * entry *and* the tree 814 * entries associated with it! 815 */ 816 if (o->skip_unmerged) { 817 add_same_unmerged(ce, o); 818 return mask; 819 } 820 } 821 src[0] = ce; 822 } 823 break; 824 } 825 } 826 827 if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0) 828 return -1; 829 830 if (src[0]) { 831 if (ce_stage(src[0])) 832 mark_ce_used_same_name(src[0], o); 833 else 834 mark_ce_used(src[0], o); 835 } 836 837 /* Now handle any directories.. */ 838 if (dirmask) { 839 unsigned long conflicts = mask & ~dirmask; 840 if (o->merge) { 841 conflicts <<= 1; 842 if (src[0]) 843 conflicts |= 1; 844 } 845 846 /* special case: "diff-index --cached" looking at a tree */ 847 if (o->diff_index_cached && 848 n == 1 && dirmask == 1 && S_ISDIR(names->mode)) { 849 int matches; 850 matches = cache_tree_matches_traversal(o->src_index->cache_tree, 851 names, info); 852 /* 853 * Everything under the name matches; skip the 854 * entire hierarchy. diff_index_cached codepath 855 * special cases D/F conflicts in such a way that 856 * it does not do any look-ahead, so this is safe. 857 */ 858 if (matches) { 859 o->cache_bottom += matches; 860 return mask; 861 } 862 } 863 864 if (traverse_trees_recursive(n, dirmask, conflicts, 865 names, info) < 0) 866 return -1; 867 return mask; 868 } 869 870 return mask; 871} 872 873/* Whole directory matching */ 874static int clear_ce_flags_dir(struct cache_entry **cache, int nr, 875 char *prefix, int prefix_len, 876 char *basename, 877 int select_mask, int clear_mask, 878 struct exclude_list *el) 879{ 880 struct cache_entry **cache_end = cache + nr; 881 int dtype = DT_DIR; 882 int ret = excluded_from_list(prefix, prefix_len, basename, &dtype, el); 883 884 prefix[prefix_len++] = '/'; 885 886 /* included, no clearing for any entries under this directory */ 887 if (!ret) { 888 for (; cache != cache_end; cache++) { 889 struct cache_entry *ce = *cache; 890 if (strncmp(ce->name, prefix, prefix_len)) 891 break; 892 } 893 return nr - (cache_end - cache); 894 } 895 896 /* excluded, clear all selected entries under this directory. */ 897 if (ret == 1) { 898 for (; cache != cache_end; cache++) { 899 struct cache_entry *ce = *cache; 900 if (select_mask && !(ce->ce_flags & select_mask)) 901 continue; 902 if (strncmp(ce->name, prefix, prefix_len)) 903 break; 904 ce->ce_flags &= ~clear_mask; 905 } 906 return nr - (cache_end - cache); 907 } 908 909 return 0; 910} 911 912/* 913 * Traverse the index, find every entry that matches according to 914 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the 915 * number of traversed entries. 916 * 917 * If select_mask is non-zero, only entries whose ce_flags has on of 918 * those bits enabled are traversed. 919 * 920 * cache : pointer to an index entry 921 * prefix_len : an offset to its path 922 * 923 * The current path ("prefix") including the trailing '/' is 924 * cache[0]->name[0..(prefix_len-1)] 925 * Top level path has prefix_len zero. 926 */ 927static int clear_ce_flags_1(struct cache_entry **cache, int nr, 928 char *prefix, int prefix_len, 929 int select_mask, int clear_mask, 930 struct exclude_list *el) 931{ 932 struct cache_entry **cache_end = cache + nr; 933 934 /* 935 * Process all entries that have the given prefix and meet 936 * select_mask condition 937 */ 938 while(cache != cache_end) { 939 struct cache_entry *ce = *cache; 940 const char *name, *slash; 941 int len, dtype; 942 943 if (select_mask && !(ce->ce_flags & select_mask)) { 944 cache++; 945 continue; 946 } 947 948 if (prefix_len && strncmp(ce->name, prefix, prefix_len)) 949 break; 950 951 name = ce->name + prefix_len; 952 slash = strchr(name, '/'); 953 954 /* If it's a directory, try whole directory match first */ 955 if (slash) { 956 int processed; 957 958 len = slash - name; 959 memcpy(prefix + prefix_len, name, len); 960 961 /* 962 * terminate the string (no trailing slash), 963 * clear_c_f_dir needs it 964 */ 965 prefix[prefix_len + len] = '\0'; 966 processed = clear_ce_flags_dir(cache, cache_end - cache, 967 prefix, prefix_len + len, 968 prefix + prefix_len, 969 select_mask, clear_mask, 970 el); 971 972 /* clear_c_f_dir eats a whole dir already? */ 973 if (processed) { 974 cache += processed; 975 continue; 976 } 977 978 prefix[prefix_len + len++] = '/'; 979 cache += clear_ce_flags_1(cache, cache_end - cache, 980 prefix, prefix_len + len, 981 select_mask, clear_mask, el); 982 continue; 983 } 984 985 /* Non-directory */ 986 dtype = ce_to_dtype(ce); 987 if (excluded_from_list(ce->name, ce_namelen(ce), name, &dtype, el) > 0) 988 ce->ce_flags &= ~clear_mask; 989 cache++; 990 } 991 return nr - (cache_end - cache); 992} 993 994static int clear_ce_flags(struct cache_entry **cache, int nr, 995 int select_mask, int clear_mask, 996 struct exclude_list *el) 997{ 998 char prefix[PATH_MAX]; 999 return clear_ce_flags_1(cache, nr,1000 prefix, 0,1001 select_mask, clear_mask,1002 el);1003}10041005/*1006 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout1007 */1008static void mark_new_skip_worktree(struct exclude_list *el,1009 struct index_state *the_index,1010 int select_flag, int skip_wt_flag)1011{1012 int i;10131014 /*1015 * 1. Pretend the narrowest worktree: only unmerged entries1016 * are checked out1017 */1018 for (i = 0; i < the_index->cache_nr; i++) {1019 struct cache_entry *ce = the_index->cache[i];10201021 if (select_flag && !(ce->ce_flags & select_flag))1022 continue;10231024 if (!ce_stage(ce))1025 ce->ce_flags |= skip_wt_flag;1026 else1027 ce->ce_flags &= ~skip_wt_flag;1028 }10291030 /*1031 * 2. Widen worktree according to sparse-checkout file.1032 * Matched entries will have skip_wt_flag cleared (i.e. "in")1033 */1034 clear_ce_flags(the_index->cache, the_index->cache_nr,1035 select_flag, skip_wt_flag, el);1036}10371038static int verify_absent(struct cache_entry *, enum unpack_trees_error_types, struct unpack_trees_options *);1039/*1040 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the1041 * resulting index, -2 on failure to reflect the changes to the work tree.1042 *1043 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally1044 */1045int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)1046{1047 int i, ret;1048 static struct cache_entry *dfc;1049 struct exclude_list el;10501051 if (len > MAX_UNPACK_TREES)1052 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);1053 memset(&state, 0, sizeof(state));1054 state.base_dir = "";1055 state.force = 1;1056 state.quiet = 1;1057 state.refresh_cache = 1;10581059 memset(&el, 0, sizeof(el));1060 if (!core_apply_sparse_checkout || !o->update)1061 o->skip_sparse_checkout = 1;1062 if (!o->skip_sparse_checkout) {1063 if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, NULL, &el, 0) < 0)1064 o->skip_sparse_checkout = 1;1065 else1066 o->el = ⪙1067 }10681069 memset(&o->result, 0, sizeof(o->result));1070 o->result.initialized = 1;1071 o->result.timestamp.sec = o->src_index->timestamp.sec;1072 o->result.timestamp.nsec = o->src_index->timestamp.nsec;1073 o->merge_size = len;1074 mark_all_ce_unused(o->src_index);10751076 /*1077 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries1078 */1079 if (!o->skip_sparse_checkout)1080 mark_new_skip_worktree(o->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE);10811082 if (!dfc)1083 dfc = xcalloc(1, cache_entry_size(0));1084 o->df_conflict_entry = dfc;10851086 if (len) {1087 const char *prefix = o->prefix ? o->prefix : "";1088 struct traverse_info info;10891090 setup_traverse_info(&info, prefix);1091 info.fn = unpack_callback;1092 info.data = o;1093 info.show_all_errors = o->show_all_errors;10941095 if (o->prefix) {1096 /*1097 * Unpack existing index entries that sort before the1098 * prefix the tree is spliced into. Note that o->merge1099 * is always true in this case.1100 */1101 while (1) {1102 struct cache_entry *ce = next_cache_entry(o);1103 if (!ce)1104 break;1105 if (ce_in_traverse_path(ce, &info))1106 break;1107 if (unpack_index_entry(ce, o) < 0)1108 goto return_failed;1109 }1110 }11111112 if (traverse_trees(len, t, &info) < 0)1113 goto return_failed;1114 }11151116 /* Any left-over entries in the index? */1117 if (o->merge) {1118 while (1) {1119 struct cache_entry *ce = next_cache_entry(o);1120 if (!ce)1121 break;1122 if (unpack_index_entry(ce, o) < 0)1123 goto return_failed;1124 }1125 }1126 mark_all_ce_unused(o->src_index);11271128 if (o->trivial_merges_only && o->nontrivial_merge) {1129 ret = unpack_failed(o, "Merge requires file-level merging");1130 goto done;1131 }11321133 if (!o->skip_sparse_checkout) {1134 int empty_worktree = 1;11351136 /*1137 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #11138 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE1139 * so apply_sparse_checkout() won't attempt to remove it from worktree1140 */1141 mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);11421143 for (i = 0; i < o->result.cache_nr; i++) {1144 struct cache_entry *ce = o->result.cache[i];11451146 /*1147 * Entries marked with CE_ADDED in merged_entry() do not have1148 * verify_absent() check (the check is effectively disabled1149 * because CE_NEW_SKIP_WORKTREE is set unconditionally).1150 *1151 * Do the real check now because we have had1152 * correct CE_NEW_SKIP_WORKTREE1153 */1154 if (ce->ce_flags & CE_ADDED &&1155 verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))1156 return -1;11571158 if (apply_sparse_checkout(ce, o)) {1159 ret = -1;1160 goto done;1161 }1162 if (!ce_skip_worktree(ce))1163 empty_worktree = 0;11641165 }1166 if (o->result.cache_nr && empty_worktree) {1167 /* dubious---why should this fail??? */1168 ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");1169 goto done;1170 }1171 }11721173 o->src_index = NULL;1174 ret = check_updates(o) ? (-2) : 0;1175 if (o->dst_index)1176 *o->dst_index = o->result;11771178done:1179 free_excludes(&el);1180 return ret;11811182return_failed:1183 if (o->show_all_errors)1184 display_error_msgs(o);1185 mark_all_ce_unused(o->src_index);1186 ret = unpack_failed(o, NULL);1187 goto done;1188}11891190/* Here come the merge functions */11911192static int reject_merge(struct cache_entry *ce, struct unpack_trees_options *o)1193{1194 return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);1195}11961197static int same(struct cache_entry *a, struct cache_entry *b)1198{1199 if (!!a != !!b)1200 return 0;1201 if (!a && !b)1202 return 1;1203 if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)1204 return 0;1205 return a->ce_mode == b->ce_mode &&1206 !hashcmp(a->sha1, b->sha1);1207}120812091210/*1211 * When a CE gets turned into an unmerged entry, we1212 * want it to be up-to-date1213 */1214static int verify_uptodate_1(struct cache_entry *ce,1215 struct unpack_trees_options *o,1216 enum unpack_trees_error_types error_type)1217{1218 struct stat st;12191220 if (o->index_only || (!((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) && (o->reset || ce_uptodate(ce))))1221 return 0;12221223 if (!lstat(ce->name, &st)) {1224 unsigned changed = ie_match_stat(o->src_index, ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);1225 if (!changed)1226 return 0;1227 /*1228 * NEEDSWORK: the current default policy is to allow1229 * submodule to be out of sync wrt the supermodule1230 * index. This needs to be tightened later for1231 * submodules that are marked to be automatically1232 * checked out.1233 */1234 if (S_ISGITLINK(ce->ce_mode))1235 return 0;1236 errno = 0;1237 }1238 if (errno == ENOENT)1239 return 0;1240 return o->gently ? -1 :1241 add_rejected_path(o, error_type, ce->name);1242}12431244static int verify_uptodate(struct cache_entry *ce,1245 struct unpack_trees_options *o)1246{1247 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1248 return 0;1249 return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);1250}12511252static int verify_uptodate_sparse(struct cache_entry *ce,1253 struct unpack_trees_options *o)1254{1255 return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);1256}12571258static void invalidate_ce_path(struct cache_entry *ce, struct unpack_trees_options *o)1259{1260 if (ce)1261 cache_tree_invalidate_path(o->src_index->cache_tree, ce->name);1262}12631264/*1265 * Check that checking out ce->sha1 in subdir ce->name is not1266 * going to overwrite any working files.1267 *1268 * Currently, git does not checkout subprojects during a superproject1269 * checkout, so it is not going to overwrite anything.1270 */1271static int verify_clean_submodule(struct cache_entry *ce,1272 enum unpack_trees_error_types error_type,1273 struct unpack_trees_options *o)1274{1275 return 0;1276}12771278static int verify_clean_subdirectory(struct cache_entry *ce,1279 enum unpack_trees_error_types error_type,1280 struct unpack_trees_options *o)1281{1282 /*1283 * we are about to extract "ce->name"; we would not want to lose1284 * anything in the existing directory there.1285 */1286 int namelen;1287 int i;1288 struct dir_struct d;1289 char *pathbuf;1290 int cnt = 0;1291 unsigned char sha1[20];12921293 if (S_ISGITLINK(ce->ce_mode) &&1294 resolve_gitlink_ref(ce->name, "HEAD", sha1) == 0) {1295 /* If we are not going to update the submodule, then1296 * we don't care.1297 */1298 if (!hashcmp(sha1, ce->sha1))1299 return 0;1300 return verify_clean_submodule(ce, error_type, o);1301 }13021303 /*1304 * First let's make sure we do not have a local modification1305 * in that directory.1306 */1307 namelen = strlen(ce->name);1308 for (i = locate_in_src_index(ce, o);1309 i < o->src_index->cache_nr;1310 i++) {1311 struct cache_entry *ce2 = o->src_index->cache[i];1312 int len = ce_namelen(ce2);1313 if (len < namelen ||1314 strncmp(ce->name, ce2->name, namelen) ||1315 ce2->name[namelen] != '/')1316 break;1317 /*1318 * ce2->name is an entry in the subdirectory to be1319 * removed.1320 */1321 if (!ce_stage(ce2)) {1322 if (verify_uptodate(ce2, o))1323 return -1;1324 add_entry(o, ce2, CE_REMOVE, 0);1325 mark_ce_used(ce2, o);1326 }1327 cnt++;1328 }13291330 /*1331 * Then we need to make sure that we do not lose a locally1332 * present file that is not ignored.1333 */1334 pathbuf = xmalloc(namelen + 2);1335 memcpy(pathbuf, ce->name, namelen);1336 strcpy(pathbuf+namelen, "/");13371338 memset(&d, 0, sizeof(d));1339 if (o->dir)1340 d.exclude_per_dir = o->dir->exclude_per_dir;1341 i = read_directory(&d, pathbuf, namelen+1, NULL);1342 if (i)1343 return o->gently ? -1 :1344 add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);1345 free(pathbuf);1346 return cnt;1347}13481349/*1350 * This gets called when there was no index entry for the tree entry 'dst',1351 * but we found a file in the working tree that 'lstat()' said was fine,1352 * and we're on a case-insensitive filesystem.1353 *1354 * See if we can find a case-insensitive match in the index that also1355 * matches the stat information, and assume it's that other file!1356 */1357static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st)1358{1359 struct cache_entry *src;13601361 src = index_name_exists(o->src_index, name, len, 1);1362 return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);1363}13641365static int check_ok_to_remove(const char *name, int len, int dtype,1366 struct cache_entry *ce, struct stat *st,1367 enum unpack_trees_error_types error_type,1368 struct unpack_trees_options *o)1369{1370 struct cache_entry *result;13711372 /*1373 * It may be that the 'lstat()' succeeded even though1374 * target 'ce' was absent, because there is an old1375 * entry that is different only in case..1376 *1377 * Ignore that lstat() if it matches.1378 */1379 if (ignore_case && icase_exists(o, name, len, st))1380 return 0;13811382 if (o->dir && excluded(o->dir, name, &dtype))1383 /*1384 * ce->name is explicitly excluded, so it is Ok to1385 * overwrite it.1386 */1387 return 0;1388 if (S_ISDIR(st->st_mode)) {1389 /*1390 * We are checking out path "foo" and1391 * found "foo/." in the working tree.1392 * This is tricky -- if we have modified1393 * files that are in "foo/" we would lose1394 * them.1395 */1396 if (verify_clean_subdirectory(ce, error_type, o) < 0)1397 return -1;1398 return 0;1399 }14001401 /*1402 * The previous round may already have decided to1403 * delete this path, which is in a subdirectory that1404 * is being replaced with a blob.1405 */1406 result = index_name_exists(&o->result, name, len, 0);1407 if (result) {1408 if (result->ce_flags & CE_REMOVE)1409 return 0;1410 }14111412 return o->gently ? -1 :1413 add_rejected_path(o, error_type, name);1414}14151416/*1417 * We do not want to remove or overwrite a working tree file that1418 * is not tracked, unless it is ignored.1419 */1420static int verify_absent_1(struct cache_entry *ce,1421 enum unpack_trees_error_types error_type,1422 struct unpack_trees_options *o)1423{1424 int len;1425 struct stat st;14261427 if (o->index_only || o->reset || !o->update)1428 return 0;14291430 len = check_leading_path(ce->name, ce_namelen(ce));1431 if (!len)1432 return 0;1433 else if (len > 0) {1434 char path[PATH_MAX + 1];1435 memcpy(path, ce->name, len);1436 path[len] = 0;1437 if (lstat(path, &st))1438 return error("cannot stat '%s': %s", path,1439 strerror(errno));14401441 return check_ok_to_remove(path, len, DT_UNKNOWN, NULL, &st,1442 error_type, o);1443 } else if (lstat(ce->name, &st)) {1444 if (errno != ENOENT)1445 return error("cannot stat '%s': %s", ce->name,1446 strerror(errno));1447 return 0;1448 } else {1449 return check_ok_to_remove(ce->name, ce_namelen(ce),1450 ce_to_dtype(ce), ce, &st,1451 error_type, o);1452 }1453}14541455static int verify_absent(struct cache_entry *ce,1456 enum unpack_trees_error_types error_type,1457 struct unpack_trees_options *o)1458{1459 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1460 return 0;1461 return verify_absent_1(ce, error_type, o);1462}14631464static int verify_absent_sparse(struct cache_entry *ce,1465 enum unpack_trees_error_types error_type,1466 struct unpack_trees_options *o)1467{1468 enum unpack_trees_error_types orphaned_error = error_type;1469 if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)1470 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;14711472 return verify_absent_1(ce, orphaned_error, o);1473}14741475static int merged_entry(struct cache_entry *merge, struct cache_entry *old,1476 struct unpack_trees_options *o)1477{1478 int update = CE_UPDATE;14791480 if (!old) {1481 /*1482 * New index entries. In sparse checkout, the following1483 * verify_absent() will be delayed until after1484 * traverse_trees() finishes in unpack_trees(), then:1485 *1486 * - CE_NEW_SKIP_WORKTREE will be computed correctly1487 * - verify_absent() be called again, this time with1488 * correct CE_NEW_SKIP_WORKTREE1489 *1490 * verify_absent() call here does nothing in sparse1491 * checkout (i.e. o->skip_sparse_checkout == 0)1492 */1493 update |= CE_ADDED;1494 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;14951496 if (verify_absent(merge, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))1497 return -1;1498 invalidate_ce_path(merge, o);1499 } else if (!(old->ce_flags & CE_CONFLICTED)) {1500 /*1501 * See if we can re-use the old CE directly?1502 * That way we get the uptodate stat info.1503 *1504 * This also removes the UPDATE flag on a match; otherwise1505 * we will end up overwriting local changes in the work tree.1506 */1507 if (same(old, merge)) {1508 copy_cache_entry(merge, old);1509 update = 0;1510 } else {1511 if (verify_uptodate(old, o))1512 return -1;1513 /* Migrate old flags over */1514 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);1515 invalidate_ce_path(old, o);1516 }1517 } else {1518 /*1519 * Previously unmerged entry left as an existence1520 * marker by read_index_unmerged();1521 */1522 invalidate_ce_path(old, o);1523 }15241525 add_entry(o, merge, update, CE_STAGEMASK);1526 return 1;1527}15281529static int deleted_entry(struct cache_entry *ce, struct cache_entry *old,1530 struct unpack_trees_options *o)1531{1532 /* Did it exist in the index? */1533 if (!old) {1534 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))1535 return -1;1536 return 0;1537 }1538 if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))1539 return -1;1540 add_entry(o, ce, CE_REMOVE, 0);1541 invalidate_ce_path(ce, o);1542 return 1;1543}15441545static int keep_entry(struct cache_entry *ce, struct unpack_trees_options *o)1546{1547 add_entry(o, ce, 0, 0);1548 return 1;1549}15501551#if DBRT_DEBUG1552static void show_stage_entry(FILE *o,1553 const char *label, const struct cache_entry *ce)1554{1555 if (!ce)1556 fprintf(o, "%s (missing)\n", label);1557 else1558 fprintf(o, "%s%06o %s %d\t%s\n",1559 label,1560 ce->ce_mode,1561 sha1_to_hex(ce->sha1),1562 ce_stage(ce),1563 ce->name);1564}1565#endif15661567int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)1568{1569 struct cache_entry *index;1570 struct cache_entry *head;1571 struct cache_entry *remote = stages[o->head_idx + 1];1572 int count;1573 int head_match = 0;1574 int remote_match = 0;15751576 int df_conflict_head = 0;1577 int df_conflict_remote = 0;15781579 int any_anc_missing = 0;1580 int no_anc_exists = 1;1581 int i;15821583 for (i = 1; i < o->head_idx; i++) {1584 if (!stages[i] || stages[i] == o->df_conflict_entry)1585 any_anc_missing = 1;1586 else1587 no_anc_exists = 0;1588 }15891590 index = stages[0];1591 head = stages[o->head_idx];15921593 if (head == o->df_conflict_entry) {1594 df_conflict_head = 1;1595 head = NULL;1596 }15971598 if (remote == o->df_conflict_entry) {1599 df_conflict_remote = 1;1600 remote = NULL;1601 }16021603 /*1604 * First, if there's a #16 situation, note that to prevent #131605 * and #14.1606 */1607 if (!same(remote, head)) {1608 for (i = 1; i < o->head_idx; i++) {1609 if (same(stages[i], head)) {1610 head_match = i;1611 }1612 if (same(stages[i], remote)) {1613 remote_match = i;1614 }1615 }1616 }16171618 /*1619 * We start with cases where the index is allowed to match1620 * something other than the head: #14(ALT) and #2ALT, where it1621 * is permitted to match the result instead.1622 */1623 /* #14, #14ALT, #2ALT */1624 if (remote && !df_conflict_head && head_match && !remote_match) {1625 if (index && !same(index, remote) && !same(index, head))1626 return o->gently ? -1 : reject_merge(index, o);1627 return merged_entry(remote, index, o);1628 }1629 /*1630 * If we have an entry in the index cache, then we want to1631 * make sure that it matches head.1632 */1633 if (index && !same(index, head))1634 return o->gently ? -1 : reject_merge(index, o);16351636 if (head) {1637 /* #5ALT, #15 */1638 if (same(head, remote))1639 return merged_entry(head, index, o);1640 /* #13, #3ALT */1641 if (!df_conflict_remote && remote_match && !head_match)1642 return merged_entry(head, index, o);1643 }16441645 /* #1 */1646 if (!head && !remote && any_anc_missing)1647 return 0;16481649 /*1650 * Under the "aggressive" rule, we resolve mostly trivial1651 * cases that we historically had git-merge-one-file resolve.1652 */1653 if (o->aggressive) {1654 int head_deleted = !head;1655 int remote_deleted = !remote;1656 struct cache_entry *ce = NULL;16571658 if (index)1659 ce = index;1660 else if (head)1661 ce = head;1662 else if (remote)1663 ce = remote;1664 else {1665 for (i = 1; i < o->head_idx; i++) {1666 if (stages[i] && stages[i] != o->df_conflict_entry) {1667 ce = stages[i];1668 break;1669 }1670 }1671 }16721673 /*1674 * Deleted in both.1675 * Deleted in one and unchanged in the other.1676 */1677 if ((head_deleted && remote_deleted) ||1678 (head_deleted && remote && remote_match) ||1679 (remote_deleted && head && head_match)) {1680 if (index)1681 return deleted_entry(index, index, o);1682 if (ce && !head_deleted) {1683 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))1684 return -1;1685 }1686 return 0;1687 }1688 /*1689 * Added in both, identically.1690 */1691 if (no_anc_exists && head && remote && same(head, remote))1692 return merged_entry(head, index, o);16931694 }16951696 /* Below are "no merge" cases, which require that the index be1697 * up-to-date to avoid the files getting overwritten with1698 * conflict resolution files.1699 */1700 if (index) {1701 if (verify_uptodate(index, o))1702 return -1;1703 }17041705 o->nontrivial_merge = 1;17061707 /* #2, #3, #4, #6, #7, #9, #10, #11. */1708 count = 0;1709 if (!head_match || !remote_match) {1710 for (i = 1; i < o->head_idx; i++) {1711 if (stages[i] && stages[i] != o->df_conflict_entry) {1712 keep_entry(stages[i], o);1713 count++;1714 break;1715 }1716 }1717 }1718#if DBRT_DEBUG1719 else {1720 fprintf(stderr, "read-tree: warning #16 detected\n");1721 show_stage_entry(stderr, "head ", stages[head_match]);1722 show_stage_entry(stderr, "remote ", stages[remote_match]);1723 }1724#endif1725 if (head) { count += keep_entry(head, o); }1726 if (remote) { count += keep_entry(remote, o); }1727 return count;1728}17291730/*1731 * Two-way merge.1732 *1733 * The rule is to "carry forward" what is in the index without losing1734 * information across a "fast-forward", favoring a successful merge1735 * over a merge failure when it makes sense. For details of the1736 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.1737 *1738 */1739int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o)1740{1741 struct cache_entry *current = src[0];1742 struct cache_entry *oldtree = src[1];1743 struct cache_entry *newtree = src[2];17441745 if (o->merge_size != 2)1746 return error("Cannot do a twoway merge of %d trees",1747 o->merge_size);17481749 if (oldtree == o->df_conflict_entry)1750 oldtree = NULL;1751 if (newtree == o->df_conflict_entry)1752 newtree = NULL;17531754 if (current) {1755 if ((!oldtree && !newtree) || /* 4 and 5 */1756 (!oldtree && newtree &&1757 same(current, newtree)) || /* 6 and 7 */1758 (oldtree && newtree &&1759 same(oldtree, newtree)) || /* 14 and 15 */1760 (oldtree && newtree &&1761 !same(oldtree, newtree) && /* 18 and 19 */1762 same(current, newtree))) {1763 return keep_entry(current, o);1764 }1765 else if (oldtree && !newtree && same(current, oldtree)) {1766 /* 10 or 11 */1767 return deleted_entry(oldtree, current, o);1768 }1769 else if (oldtree && newtree &&1770 same(current, oldtree) && !same(current, newtree)) {1771 /* 20 or 21 */1772 return merged_entry(newtree, current, o);1773 }1774 else {1775 /* all other failures */1776 if (oldtree)1777 return o->gently ? -1 : reject_merge(oldtree, o);1778 if (current)1779 return o->gently ? -1 : reject_merge(current, o);1780 if (newtree)1781 return o->gently ? -1 : reject_merge(newtree, o);1782 return -1;1783 }1784 }1785 else if (newtree) {1786 if (oldtree && !o->initial_checkout) {1787 /*1788 * deletion of the path was staged;1789 */1790 if (same(oldtree, newtree))1791 return 1;1792 return reject_merge(oldtree, o);1793 }1794 return merged_entry(newtree, current, o);1795 }1796 return deleted_entry(oldtree, current, o);1797}17981799/*1800 * Bind merge.1801 *1802 * Keep the index entries at stage0, collapse stage1 but make sure1803 * stage0 does not have anything there.1804 */1805int bind_merge(struct cache_entry **src,1806 struct unpack_trees_options *o)1807{1808 struct cache_entry *old = src[0];1809 struct cache_entry *a = src[1];18101811 if (o->merge_size != 1)1812 return error("Cannot do a bind merge of %d trees\n",1813 o->merge_size);1814 if (a && old)1815 return o->gently ? -1 :1816 error(ERRORMSG(o, ERROR_BIND_OVERLAP), a->name, old->name);1817 if (!a)1818 return keep_entry(old, o);1819 else1820 return merged_entry(a, NULL, o);1821}18221823/*1824 * One-way merge.1825 *1826 * The rule is:1827 * - take the stat information from stage0, take the data from stage11828 */1829int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)1830{1831 struct cache_entry *old = src[0];1832 struct cache_entry *a = src[1];18331834 if (o->merge_size != 1)1835 return error("Cannot do a oneway merge of %d trees",1836 o->merge_size);18371838 if (!a || a == o->df_conflict_entry)1839 return deleted_entry(old, old, o);18401841 if (old && same(old, a)) {1842 int update = 0;1843 if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) {1844 struct stat st;1845 if (lstat(old->name, &st) ||1846 ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))1847 update |= CE_UPDATE;1848 }1849 add_entry(o, old, update, 0);1850 return 0;1851 }1852 return merged_entry(a, old, o);1853}