1#define NO_THE_INDEX_COMPATIBILITY_MACROS 2#include"cache.h" 3#include"argv-array.h" 4#include"repository.h" 5#include"config.h" 6#include"dir.h" 7#include"tree.h" 8#include"tree-walk.h" 9#include"cache-tree.h" 10#include"unpack-trees.h" 11#include"progress.h" 12#include"refs.h" 13#include"attr.h" 14#include"split-index.h" 15#include"dir.h" 16#include"submodule.h" 17#include"submodule-config.h" 18#include"fsmonitor.h" 19#include"object-store.h" 20#include"fetch-object.h" 21 22/* 23 * Error messages expected by scripts out of plumbing commands such as 24 * read-tree. Non-scripted Porcelain is not required to use these messages 25 * and in fact are encouraged to reword them to better suit their particular 26 * situation better. See how "git checkout" and "git merge" replaces 27 * them using setup_unpack_trees_porcelain(), for example. 28 */ 29static const char*unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { 30/* ERROR_WOULD_OVERWRITE */ 31"Entry '%s' would be overwritten by merge. Cannot merge.", 32 33/* ERROR_NOT_UPTODATE_FILE */ 34"Entry '%s' not uptodate. Cannot merge.", 35 36/* ERROR_NOT_UPTODATE_DIR */ 37"Updating '%s' would lose untracked files in it", 38 39/* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */ 40"Untracked working tree file '%s' would be overwritten by merge.", 41 42/* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */ 43"Untracked working tree file '%s' would be removed by merge.", 44 45/* ERROR_BIND_OVERLAP */ 46"Entry '%s' overlaps with '%s'. Cannot bind.", 47 48/* ERROR_SPARSE_NOT_UPTODATE_FILE */ 49"Entry '%s' not uptodate. Cannot update sparse checkout.", 50 51/* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ 52"Working tree file '%s' would be overwritten by sparse checkout update.", 53 54/* ERROR_WOULD_LOSE_ORPHANED_REMOVED */ 55"Working tree file '%s' would be removed by sparse checkout update.", 56 57/* ERROR_WOULD_LOSE_SUBMODULE */ 58"Submodule '%s' cannot checkout new HEAD.", 59}; 60 61#define ERRORMSG(o,type) \ 62 ( ((o) && (o)->msgs[(type)]) \ 63 ? ((o)->msgs[(type)]) \ 64 : (unpack_plumbing_errors[(type)]) ) 65 66static const char*super_prefixed(const char*path) 67{ 68/* 69 * It is necessary and sufficient to have two static buffers 70 * here, as the return value of this function is fed to 71 * error() using the unpack_*_errors[] templates we see above. 72 */ 73static struct strbuf buf[2] = {STRBUF_INIT, STRBUF_INIT}; 74static int super_prefix_len = -1; 75static unsigned idx =ARRAY_SIZE(buf) -1; 76 77if(super_prefix_len <0) { 78const char*super_prefix =get_super_prefix(); 79if(!super_prefix) { 80 super_prefix_len =0; 81}else{ 82int i; 83for(i =0; i <ARRAY_SIZE(buf); i++) 84strbuf_addstr(&buf[i], super_prefix); 85 super_prefix_len = buf[0].len; 86} 87} 88 89if(!super_prefix_len) 90return path; 91 92if(++idx >=ARRAY_SIZE(buf)) 93 idx =0; 94 95strbuf_setlen(&buf[idx], super_prefix_len); 96strbuf_addstr(&buf[idx], path); 97 98return buf[idx].buf; 99} 100 101voidsetup_unpack_trees_porcelain(struct unpack_trees_options *opts, 102const char*cmd) 103{ 104int i; 105const char**msgs = opts->msgs; 106const char*msg; 107 108argv_array_init(&opts->msgs_to_free); 109 110if(!strcmp(cmd,"checkout")) 111 msg = advice_commit_before_merge 112?_("Your local changes to the following files would be overwritten by checkout:\n%%s" 113"Please commit your changes or stash them before you switch branches.") 114:_("Your local changes to the following files would be overwritten by checkout:\n%%s"); 115else if(!strcmp(cmd,"merge")) 116 msg = advice_commit_before_merge 117?_("Your local changes to the following files would be overwritten by merge:\n%%s" 118"Please commit your changes or stash them before you merge.") 119:_("Your local changes to the following files would be overwritten by merge:\n%%s"); 120else 121 msg = advice_commit_before_merge 122?_("Your local changes to the following files would be overwritten by%s:\n%%s" 123"Please commit your changes or stash them before you%s.") 124:_("Your local changes to the following files would be overwritten by%s:\n%%s"); 125 msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = 126argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); 127 128 msgs[ERROR_NOT_UPTODATE_DIR] = 129_("Updating the following directories would lose untracked files in them:\n%s"); 130 131if(!strcmp(cmd,"checkout")) 132 msg = advice_commit_before_merge 133?_("The following untracked working tree files would be removed by checkout:\n%%s" 134"Please move or remove them before you switch branches.") 135:_("The following untracked working tree files would be removed by checkout:\n%%s"); 136else if(!strcmp(cmd,"merge")) 137 msg = advice_commit_before_merge 138?_("The following untracked working tree files would be removed by merge:\n%%s" 139"Please move or remove them before you merge.") 140:_("The following untracked working tree files would be removed by merge:\n%%s"); 141else 142 msg = advice_commit_before_merge 143?_("The following untracked working tree files would be removed by%s:\n%%s" 144"Please move or remove them before you%s.") 145:_("The following untracked working tree files would be removed by%s:\n%%s"); 146 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = 147argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); 148 149if(!strcmp(cmd,"checkout")) 150 msg = advice_commit_before_merge 151?_("The following untracked working tree files would be overwritten by checkout:\n%%s" 152"Please move or remove them before you switch branches.") 153:_("The following untracked working tree files would be overwritten by checkout:\n%%s"); 154else if(!strcmp(cmd,"merge")) 155 msg = advice_commit_before_merge 156?_("The following untracked working tree files would be overwritten by merge:\n%%s" 157"Please move or remove them before you merge.") 158:_("The following untracked working tree files would be overwritten by merge:\n%%s"); 159else 160 msg = advice_commit_before_merge 161?_("The following untracked working tree files would be overwritten by%s:\n%%s" 162"Please move or remove them before you%s.") 163:_("The following untracked working tree files would be overwritten by%s:\n%%s"); 164 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = 165argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); 166 167/* 168 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we 169 * cannot easily display it as a list. 170 */ 171 msgs[ERROR_BIND_OVERLAP] =_("Entry '%s' overlaps with '%s'. Cannot bind."); 172 173 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = 174_("Cannot update sparse checkout: the following entries are not up to date:\n%s"); 175 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = 176_("The following working tree files would be overwritten by sparse checkout update:\n%s"); 177 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = 178_("The following working tree files would be removed by sparse checkout update:\n%s"); 179 msgs[ERROR_WOULD_LOSE_SUBMODULE] = 180_("Cannot update submodule:\n%s"); 181 182 opts->show_all_errors =1; 183/* rejected paths may not have a static buffer */ 184for(i =0; i <ARRAY_SIZE(opts->unpack_rejects); i++) 185 opts->unpack_rejects[i].strdup_strings =1; 186} 187 188voidclear_unpack_trees_porcelain(struct unpack_trees_options *opts) 189{ 190argv_array_clear(&opts->msgs_to_free); 191memset(opts->msgs,0,sizeof(opts->msgs)); 192} 193 194static intdo_add_entry(struct unpack_trees_options *o,struct cache_entry *ce, 195unsigned int set,unsigned int clear) 196{ 197 clear |= CE_HASHED; 198 199if(set & CE_REMOVE) 200 set |= CE_WT_REMOVE; 201 202 ce->ce_flags = (ce->ce_flags & ~clear) | set; 203returnadd_index_entry(&o->result, ce, 204 ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); 205} 206 207static struct cache_entry *dup_entry(const struct cache_entry *ce) 208{ 209unsigned int size =ce_size(ce); 210struct cache_entry *new_entry =xmalloc(size); 211 212memcpy(new_entry, ce, size); 213return new_entry; 214} 215 216static voidadd_entry(struct unpack_trees_options *o, 217const struct cache_entry *ce, 218unsigned int set,unsigned int clear) 219{ 220do_add_entry(o,dup_entry(ce), set, clear); 221} 222 223/* 224 * add error messages on path <path> 225 * corresponding to the type <e> with the message <msg> 226 * indicating if it should be display in porcelain or not 227 */ 228static intadd_rejected_path(struct unpack_trees_options *o, 229enum unpack_trees_error_types e, 230const char*path) 231{ 232if(!o->show_all_errors) 233returnerror(ERRORMSG(o, e),super_prefixed(path)); 234 235/* 236 * Otherwise, insert in a list for future display by 237 * display_error_msgs() 238 */ 239string_list_append(&o->unpack_rejects[e], path); 240return-1; 241} 242 243/* 244 * display all the error messages stored in a nice way 245 */ 246static voiddisplay_error_msgs(struct unpack_trees_options *o) 247{ 248int e, i; 249int something_displayed =0; 250for(e =0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { 251struct string_list *rejects = &o->unpack_rejects[e]; 252if(rejects->nr >0) { 253struct strbuf path = STRBUF_INIT; 254 something_displayed =1; 255for(i =0; i < rejects->nr; i++) 256strbuf_addf(&path,"\t%s\n", rejects->items[i].string); 257error(ERRORMSG(o, e),super_prefixed(path.buf)); 258strbuf_release(&path); 259} 260string_list_clear(rejects,0); 261} 262if(something_displayed) 263fprintf(stderr,_("Aborting\n")); 264} 265 266static intcheck_submodule_move_head(const struct cache_entry *ce, 267const char*old_id, 268const char*new_id, 269struct unpack_trees_options *o) 270{ 271unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN; 272const struct submodule *sub =submodule_from_ce(ce); 273 274if(!sub) 275return0; 276 277if(o->reset) 278 flags |= SUBMODULE_MOVE_HEAD_FORCE; 279 280if(submodule_move_head(ce->name, old_id, new_id, flags)) 281return o->gently ? -1: 282add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name); 283return0; 284} 285 286/* 287 * Preform the loading of the repository's gitmodules file. This function is 288 * used by 'check_update()' to perform loading of the gitmodules file in two 289 * differnt situations: 290 * (1) before removing entries from the working tree if the gitmodules file has 291 * been marked for removal. This situation is specified by 'state' == NULL. 292 * (2) before checking out entries to the working tree if the gitmodules file 293 * has been marked for update. This situation is specified by 'state' != NULL. 294 */ 295static voidload_gitmodules_file(struct index_state *index, 296struct checkout *state) 297{ 298int pos =index_name_pos(index, GITMODULES_FILE,strlen(GITMODULES_FILE)); 299 300if(pos >=0) { 301struct cache_entry *ce = index->cache[pos]; 302if(!state && ce->ce_flags & CE_WT_REMOVE) { 303repo_read_gitmodules(the_repository); 304}else if(state && (ce->ce_flags & CE_UPDATE)) { 305submodule_free(the_repository); 306checkout_entry(ce, state, NULL); 307repo_read_gitmodules(the_repository); 308} 309} 310} 311 312/* 313 * Unlink the last component and schedule the leading directories for 314 * removal, such that empty directories get removed. 315 */ 316static voidunlink_entry(const struct cache_entry *ce) 317{ 318const struct submodule *sub =submodule_from_ce(ce); 319if(sub) { 320/* state.force is set at the caller. */ 321submodule_move_head(ce->name,"HEAD", NULL, 322 SUBMODULE_MOVE_HEAD_FORCE); 323} 324if(!check_leading_path(ce->name,ce_namelen(ce))) 325return; 326if(remove_or_warn(ce->ce_mode, ce->name)) 327return; 328schedule_dir_for_removal(ce->name,ce_namelen(ce)); 329} 330 331static struct progress *get_progress(struct unpack_trees_options *o) 332{ 333unsigned cnt =0, total =0; 334struct index_state *index = &o->result; 335 336if(!o->update || !o->verbose_update) 337return NULL; 338 339for(; cnt < index->cache_nr; cnt++) { 340const struct cache_entry *ce = index->cache[cnt]; 341if(ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE)) 342 total++; 343} 344 345returnstart_delayed_progress(_("Checking out files"), total); 346} 347 348static voidsetup_collided_checkout_detection(struct checkout *state, 349struct index_state *index) 350{ 351int i; 352 353 state->clone =1; 354for(i =0; i < index->cache_nr; i++) 355 index->cache[i]->ce_flags &= ~CE_MATCHED; 356} 357 358static voidreport_collided_checkout(struct index_state *index) 359{ 360struct string_list list = STRING_LIST_INIT_NODUP; 361int i; 362 363for(i =0; i < index->cache_nr; i++) { 364struct cache_entry *ce = index->cache[i]; 365 366if(!(ce->ce_flags & CE_MATCHED)) 367continue; 368 369string_list_append(&list, ce->name); 370 ce->ce_flags &= ~CE_MATCHED; 371} 372 373 list.cmp = fspathcmp; 374string_list_sort(&list); 375 376if(list.nr) { 377warning(_("the following paths have collided (e.g. case-sensitive paths\n" 378"on a case-insensitive filesystem) and only one from the same\n" 379"colliding group is in the working tree:\n")); 380 381for(i =0; i < list.nr; i++) 382fprintf(stderr," '%s'\n", list.items[i].string); 383} 384 385string_list_clear(&list,0); 386} 387 388static intcheck_updates(struct unpack_trees_options *o) 389{ 390unsigned cnt =0; 391int errs =0; 392struct progress *progress = NULL; 393struct index_state *index = &o->result; 394struct checkout state = CHECKOUT_INIT; 395int i; 396 397 state.force =1; 398 state.quiet =1; 399 state.refresh_cache =1; 400 state.istate = index; 401 402if(o->clone) 403setup_collided_checkout_detection(&state, index); 404 405 progress =get_progress(o); 406 407if(o->update) 408git_attr_set_direction(GIT_ATTR_CHECKOUT, index); 409 410if(should_update_submodules() && o->update && !o->dry_run) 411load_gitmodules_file(index, NULL); 412 413for(i =0; i < index->cache_nr; i++) { 414const struct cache_entry *ce = index->cache[i]; 415 416if(ce->ce_flags & CE_WT_REMOVE) { 417display_progress(progress, ++cnt); 418if(o->update && !o->dry_run) 419unlink_entry(ce); 420} 421} 422remove_marked_cache_entries(index); 423remove_scheduled_dirs(); 424 425if(should_update_submodules() && o->update && !o->dry_run) 426load_gitmodules_file(index, &state); 427 428enable_delayed_checkout(&state); 429if(repository_format_partial_clone && o->update && !o->dry_run) { 430/* 431 * Prefetch the objects that are to be checked out in the loop 432 * below. 433 */ 434struct oid_array to_fetch = OID_ARRAY_INIT; 435int fetch_if_missing_store = fetch_if_missing; 436 fetch_if_missing =0; 437for(i =0; i < index->cache_nr; i++) { 438struct cache_entry *ce = index->cache[i]; 439if((ce->ce_flags & CE_UPDATE) && 440!S_ISGITLINK(ce->ce_mode)) { 441if(!has_object_file(&ce->oid)) 442oid_array_append(&to_fetch, &ce->oid); 443} 444} 445if(to_fetch.nr) 446fetch_objects(repository_format_partial_clone, 447&to_fetch); 448 fetch_if_missing = fetch_if_missing_store; 449oid_array_clear(&to_fetch); 450} 451for(i =0; i < index->cache_nr; i++) { 452struct cache_entry *ce = index->cache[i]; 453 454if(ce->ce_flags & CE_UPDATE) { 455if(ce->ce_flags & CE_WT_REMOVE) 456BUG("both update and delete flags are set on%s", 457 ce->name); 458display_progress(progress, ++cnt); 459 ce->ce_flags &= ~CE_UPDATE; 460if(o->update && !o->dry_run) { 461 errs |=checkout_entry(ce, &state, NULL); 462} 463} 464} 465stop_progress(&progress); 466 errs |=finish_delayed_checkout(&state); 467if(o->update) 468git_attr_set_direction(GIT_ATTR_CHECKIN, NULL); 469 470if(o->clone) 471report_collided_checkout(index); 472 473return errs !=0; 474} 475 476static intverify_uptodate_sparse(const struct cache_entry *ce, 477struct unpack_trees_options *o); 478static intverify_absent_sparse(const struct cache_entry *ce, 479enum unpack_trees_error_types, 480struct unpack_trees_options *o); 481 482static intapply_sparse_checkout(struct index_state *istate, 483struct cache_entry *ce, 484struct unpack_trees_options *o) 485{ 486int was_skip_worktree =ce_skip_worktree(ce); 487 488if(ce->ce_flags & CE_NEW_SKIP_WORKTREE) 489 ce->ce_flags |= CE_SKIP_WORKTREE; 490else 491 ce->ce_flags &= ~CE_SKIP_WORKTREE; 492if(was_skip_worktree !=ce_skip_worktree(ce)) { 493 ce->ce_flags |= CE_UPDATE_IN_BASE; 494mark_fsmonitor_invalid(istate, ce); 495 istate->cache_changed |= CE_ENTRY_CHANGED; 496} 497 498/* 499 * if (!was_skip_worktree && !ce_skip_worktree()) { 500 * This is perfectly normal. Move on; 501 * } 502 */ 503 504/* 505 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout 506 * area as a result of ce_skip_worktree() shortcuts in 507 * verify_absent() and verify_uptodate(). 508 * Make sure they don't modify worktree if they are already 509 * outside checkout area 510 */ 511if(was_skip_worktree &&ce_skip_worktree(ce)) { 512 ce->ce_flags &= ~CE_UPDATE; 513 514/* 515 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also 516 * on to get that file removed from both index and worktree. 517 * If that file is already outside worktree area, don't 518 * bother remove it. 519 */ 520if(ce->ce_flags & CE_REMOVE) 521 ce->ce_flags &= ~CE_WT_REMOVE; 522} 523 524if(!was_skip_worktree &&ce_skip_worktree(ce)) { 525/* 526 * If CE_UPDATE is set, verify_uptodate() must be called already 527 * also stat info may have lost after merged_entry() so calling 528 * verify_uptodate() again may fail 529 */ 530if(!(ce->ce_flags & CE_UPDATE) &&verify_uptodate_sparse(ce, o)) 531return-1; 532 ce->ce_flags |= CE_WT_REMOVE; 533 ce->ce_flags &= ~CE_UPDATE; 534} 535if(was_skip_worktree && !ce_skip_worktree(ce)) { 536if(verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) 537return-1; 538 ce->ce_flags |= CE_UPDATE; 539} 540return0; 541} 542 543staticinlineintcall_unpack_fn(const struct cache_entry *const*src, 544struct unpack_trees_options *o) 545{ 546int ret = o->fn(src, o); 547if(ret >0) 548 ret =0; 549return ret; 550} 551 552static voidmark_ce_used(struct cache_entry *ce,struct unpack_trees_options *o) 553{ 554 ce->ce_flags |= CE_UNPACKED; 555 556if(o->cache_bottom < o->src_index->cache_nr && 557 o->src_index->cache[o->cache_bottom] == ce) { 558int bottom = o->cache_bottom; 559while(bottom < o->src_index->cache_nr && 560 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) 561 bottom++; 562 o->cache_bottom = bottom; 563} 564} 565 566static voidmark_all_ce_unused(struct index_state *index) 567{ 568int i; 569for(i =0; i < index->cache_nr; i++) 570 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE); 571} 572 573static intlocate_in_src_index(const struct cache_entry *ce, 574struct unpack_trees_options *o) 575{ 576struct index_state *index = o->src_index; 577int len =ce_namelen(ce); 578int pos =index_name_pos(index, ce->name, len); 579if(pos <0) 580 pos = -1- pos; 581return pos; 582} 583 584/* 585 * We call unpack_index_entry() with an unmerged cache entry 586 * only in diff-index, and it wants a single callback. Skip 587 * the other unmerged entry with the same name. 588 */ 589static voidmark_ce_used_same_name(struct cache_entry *ce, 590struct unpack_trees_options *o) 591{ 592struct index_state *index = o->src_index; 593int len =ce_namelen(ce); 594int pos; 595 596for(pos =locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { 597struct cache_entry *next = index->cache[pos]; 598if(len !=ce_namelen(next) || 599memcmp(ce->name, next->name, len)) 600break; 601mark_ce_used(next, o); 602} 603} 604 605static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) 606{ 607const struct index_state *index = o->src_index; 608int pos = o->cache_bottom; 609 610while(pos < index->cache_nr) { 611struct cache_entry *ce = index->cache[pos]; 612if(!(ce->ce_flags & CE_UNPACKED)) 613return ce; 614 pos++; 615} 616return NULL; 617} 618 619static voidadd_same_unmerged(const struct cache_entry *ce, 620struct unpack_trees_options *o) 621{ 622struct index_state *index = o->src_index; 623int len =ce_namelen(ce); 624int pos =index_name_pos(index, ce->name, len); 625 626if(0<= pos) 627die("programming error in a caller of mark_ce_used_same_name"); 628for(pos = -pos -1; pos < index->cache_nr; pos++) { 629struct cache_entry *next = index->cache[pos]; 630if(len !=ce_namelen(next) || 631memcmp(ce->name, next->name, len)) 632break; 633add_entry(o, next,0,0); 634mark_ce_used(next, o); 635} 636} 637 638static intunpack_index_entry(struct cache_entry *ce, 639struct unpack_trees_options *o) 640{ 641const struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, }; 642int ret; 643 644 src[0] = ce; 645 646mark_ce_used(ce, o); 647if(ce_stage(ce)) { 648if(o->skip_unmerged) { 649add_entry(o, ce,0,0); 650return0; 651} 652} 653 ret =call_unpack_fn(src, o); 654if(ce_stage(ce)) 655mark_ce_used_same_name(ce, o); 656return ret; 657} 658 659static intfind_cache_pos(struct traverse_info *,const struct name_entry *); 660 661static voidrestore_cache_bottom(struct traverse_info *info,int bottom) 662{ 663struct unpack_trees_options *o = info->data; 664 665if(o->diff_index_cached) 666return; 667 o->cache_bottom = bottom; 668} 669 670static intswitch_cache_bottom(struct traverse_info *info) 671{ 672struct unpack_trees_options *o = info->data; 673int ret, pos; 674 675if(o->diff_index_cached) 676return0; 677 ret = o->cache_bottom; 678 pos =find_cache_pos(info->prev, &info->name); 679 680if(pos < -1) 681 o->cache_bottom = -2- pos; 682else if(pos <0) 683 o->cache_bottom = o->src_index->cache_nr; 684return ret; 685} 686 687staticinlineintare_same_oid(struct name_entry *name_j,struct name_entry *name_k) 688{ 689return name_j->oid && name_k->oid && !oidcmp(name_j->oid, name_k->oid); 690} 691 692static inttraverse_trees_recursive(int n,unsigned long dirmask, 693unsigned long df_conflicts, 694struct name_entry *names, 695struct traverse_info *info) 696{ 697int i, ret, bottom; 698int nr_buf =0; 699struct tree_desc t[MAX_UNPACK_TREES]; 700void*buf[MAX_UNPACK_TREES]; 701struct traverse_info newinfo; 702struct name_entry *p; 703 704 p = names; 705while(!p->mode) 706 p++; 707 708 newinfo = *info; 709 newinfo.prev = info; 710 newinfo.pathspec = info->pathspec; 711 newinfo.name = *p; 712 newinfo.pathlen +=tree_entry_len(p) +1; 713 newinfo.df_conflicts |= df_conflicts; 714 715/* 716 * Fetch the tree from the ODB for each peer directory in the 717 * n commits. 718 * 719 * For 2- and 3-way traversals, we try to avoid hitting the 720 * ODB twice for the same OID. This should yield a nice speed 721 * up in checkouts and merges when the commits are similar. 722 * 723 * We don't bother doing the full O(n^2) search for larger n, 724 * because wider traversals don't happen that often and we 725 * avoid the search setup. 726 * 727 * When 2 peer OIDs are the same, we just copy the tree 728 * descriptor data. This implicitly borrows the buffer 729 * data from the earlier cell. 730 */ 731for(i =0; i < n; i++, dirmask >>=1) { 732if(i >0&&are_same_oid(&names[i], &names[i -1])) 733 t[i] = t[i -1]; 734else if(i >1&&are_same_oid(&names[i], &names[i -2])) 735 t[i] = t[i -2]; 736else{ 737const struct object_id *oid = NULL; 738if(dirmask &1) 739 oid = names[i].oid; 740 buf[nr_buf++] =fill_tree_descriptor(t + i, oid); 741} 742} 743 744 bottom =switch_cache_bottom(&newinfo); 745 ret =traverse_trees(n, t, &newinfo); 746restore_cache_bottom(&newinfo, bottom); 747 748for(i =0; i < nr_buf; i++) 749free(buf[i]); 750 751return ret; 752} 753 754/* 755 * Compare the traverse-path to the cache entry without actually 756 * having to generate the textual representation of the traverse 757 * path. 758 * 759 * NOTE! This *only* compares up to the size of the traverse path 760 * itself - the caller needs to do the final check for the cache 761 * entry having more data at the end! 762 */ 763static intdo_compare_entry_piecewise(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 764{ 765int len, pathlen, ce_len; 766const char*ce_name; 767 768if(info->prev) { 769int cmp =do_compare_entry_piecewise(ce, info->prev, 770&info->name); 771if(cmp) 772return cmp; 773} 774 pathlen = info->pathlen; 775 ce_len =ce_namelen(ce); 776 777/* If ce_len < pathlen then we must have previously hit "name == directory" entry */ 778if(ce_len < pathlen) 779return-1; 780 781 ce_len -= pathlen; 782 ce_name = ce->name + pathlen; 783 784 len =tree_entry_len(n); 785returndf_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 786} 787 788static intdo_compare_entry(const struct cache_entry *ce, 789const struct traverse_info *info, 790const struct name_entry *n) 791{ 792int len, pathlen, ce_len; 793const char*ce_name; 794int cmp; 795 796/* 797 * If we have not precomputed the traverse path, it is quicker 798 * to avoid doing so. But if we have precomputed it, 799 * it is quicker to use the precomputed version. 800 */ 801if(!info->traverse_path) 802returndo_compare_entry_piecewise(ce, info, n); 803 804 cmp =strncmp(ce->name, info->traverse_path, info->pathlen); 805if(cmp) 806return cmp; 807 808 pathlen = info->pathlen; 809 ce_len =ce_namelen(ce); 810 811if(ce_len < pathlen) 812return-1; 813 814 ce_len -= pathlen; 815 ce_name = ce->name + pathlen; 816 817 len =tree_entry_len(n); 818returndf_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 819} 820 821static intcompare_entry(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 822{ 823int cmp =do_compare_entry(ce, info, n); 824if(cmp) 825return cmp; 826 827/* 828 * Even if the beginning compared identically, the ce should 829 * compare as bigger than a directory leading up to it! 830 */ 831returnce_namelen(ce) >traverse_path_len(info, n); 832} 833 834static intce_in_traverse_path(const struct cache_entry *ce, 835const struct traverse_info *info) 836{ 837if(!info->prev) 838return1; 839if(do_compare_entry(ce, info->prev, &info->name)) 840return0; 841/* 842 * If ce (blob) is the same name as the path (which is a tree 843 * we will be descending into), it won't be inside it. 844 */ 845return(info->pathlen <ce_namelen(ce)); 846} 847 848static struct cache_entry *create_ce_entry(const struct traverse_info *info,const struct name_entry *n,int stage) 849{ 850int len =traverse_path_len(info, n); 851struct cache_entry *ce =xcalloc(1,cache_entry_size(len)); 852 853 ce->ce_mode =create_ce_mode(n->mode); 854 ce->ce_flags =create_ce_flags(stage); 855 ce->ce_namelen = len; 856oidcpy(&ce->oid, n->oid); 857make_traverse_path(ce->name, info, n); 858 859return ce; 860} 861 862static intunpack_nondirectories(int n,unsigned long mask, 863unsigned long dirmask, 864struct cache_entry **src, 865const struct name_entry *names, 866const struct traverse_info *info) 867{ 868int i; 869struct unpack_trees_options *o = info->data; 870unsigned long conflicts = info->df_conflicts | dirmask; 871 872/* Do we have *only* directories? Nothing to do */ 873if(mask == dirmask && !src[0]) 874return0; 875 876/* 877 * Ok, we've filled in up to any potential index entry in src[0], 878 * now do the rest. 879 */ 880for(i =0; i < n; i++) { 881int stage; 882unsigned int bit =1ul<< i; 883if(conflicts & bit) { 884 src[i + o->merge] = o->df_conflict_entry; 885continue; 886} 887if(!(mask & bit)) 888continue; 889if(!o->merge) 890 stage =0; 891else if(i +1< o->head_idx) 892 stage =1; 893else if(i +1> o->head_idx) 894 stage =3; 895else 896 stage =2; 897 src[i + o->merge] =create_ce_entry(info, names + i, stage); 898} 899 900if(o->merge) { 901int rc =call_unpack_fn((const struct cache_entry *const*)src, 902 o); 903for(i =0; i < n; i++) { 904struct cache_entry *ce = src[i + o->merge]; 905if(ce != o->df_conflict_entry) 906free(ce); 907} 908return rc; 909} 910 911for(i =0; i < n; i++) 912if(src[i] && src[i] != o->df_conflict_entry) 913if(do_add_entry(o, src[i],0,0)) 914return-1; 915 916return0; 917} 918 919static intunpack_failed(struct unpack_trees_options *o,const char*message) 920{ 921discard_index(&o->result); 922if(!o->gently && !o->exiting_early) { 923if(message) 924returnerror("%s", message); 925return-1; 926} 927return-1; 928} 929 930/* 931 * The tree traversal is looking at name p. If we have a matching entry, 932 * return it. If name p is a directory in the index, do not return 933 * anything, as we will want to match it when the traversal descends into 934 * the directory. 935 */ 936static intfind_cache_pos(struct traverse_info *info, 937const struct name_entry *p) 938{ 939int pos; 940struct unpack_trees_options *o = info->data; 941struct index_state *index = o->src_index; 942int pfxlen = info->pathlen; 943int p_len =tree_entry_len(p); 944 945for(pos = o->cache_bottom; pos < index->cache_nr; pos++) { 946const struct cache_entry *ce = index->cache[pos]; 947const char*ce_name, *ce_slash; 948int cmp, ce_len; 949 950if(ce->ce_flags & CE_UNPACKED) { 951/* 952 * cache_bottom entry is already unpacked, so 953 * we can never match it; don't check it 954 * again. 955 */ 956if(pos == o->cache_bottom) 957++o->cache_bottom; 958continue; 959} 960if(!ce_in_traverse_path(ce, info)) { 961/* 962 * Check if we can skip future cache checks 963 * (because we're already past all possible 964 * entries in the traverse path). 965 */ 966if(info->traverse_path) { 967if(strncmp(ce->name, info->traverse_path, 968 info->pathlen) >0) 969break; 970} 971continue; 972} 973 ce_name = ce->name + pfxlen; 974 ce_slash =strchr(ce_name,'/'); 975if(ce_slash) 976 ce_len = ce_slash - ce_name; 977else 978 ce_len =ce_namelen(ce) - pfxlen; 979 cmp =name_compare(p->path, p_len, ce_name, ce_len); 980/* 981 * Exact match; if we have a directory we need to 982 * delay returning it. 983 */ 984if(!cmp) 985return ce_slash ? -2- pos : pos; 986if(0< cmp) 987continue;/* keep looking */ 988/* 989 * ce_name sorts after p->path; could it be that we 990 * have files under p->path directory in the index? 991 * E.g. ce_name == "t-i", and p->path == "t"; we may 992 * have "t/a" in the index. 993 */ 994if(p_len < ce_len && !memcmp(ce_name, p->path, p_len) && 995 ce_name[p_len] <'/') 996continue;/* keep looking */ 997break; 998} 999return-1;1000}10011002static struct cache_entry *find_cache_entry(struct traverse_info *info,1003const struct name_entry *p)1004{1005int pos =find_cache_pos(info, p);1006struct unpack_trees_options *o = info->data;10071008if(0<= pos)1009return o->src_index->cache[pos];1010else1011return NULL;1012}10131014static voiddebug_path(struct traverse_info *info)1015{1016if(info->prev) {1017debug_path(info->prev);1018if(*info->prev->name.path)1019putchar('/');1020}1021printf("%s", info->name.path);1022}10231024static voiddebug_name_entry(int i,struct name_entry *n)1025{1026printf("ent#%d %06o%s\n", i,1027 n->path ? n->mode :0,1028 n->path ? n->path :"(missing)");1029}10301031static voiddebug_unpack_callback(int n,1032unsigned long mask,1033unsigned long dirmask,1034struct name_entry *names,1035struct traverse_info *info)1036{1037int i;1038printf("* unpack mask%lu, dirmask%lu, cnt%d",1039 mask, dirmask, n);1040debug_path(info);1041putchar('\n');1042for(i =0; i < n; i++)1043debug_name_entry(i, names + i);1044}10451046static intunpack_callback(int n,unsigned long mask,unsigned long dirmask,struct name_entry *names,struct traverse_info *info)1047{1048struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, };1049struct unpack_trees_options *o = info->data;1050const struct name_entry *p = names;10511052/* Find first entry with a real name (we could use "mask" too) */1053while(!p->mode)1054 p++;10551056if(o->debug_unpack)1057debug_unpack_callback(n, mask, dirmask, names, info);10581059/* Are we supposed to look at the index too? */1060if(o->merge) {1061while(1) {1062int cmp;1063struct cache_entry *ce;10641065if(o->diff_index_cached)1066 ce =next_cache_entry(o);1067else1068 ce =find_cache_entry(info, p);10691070if(!ce)1071break;1072 cmp =compare_entry(ce, info, p);1073if(cmp <0) {1074if(unpack_index_entry(ce, o) <0)1075returnunpack_failed(o, NULL);1076continue;1077}1078if(!cmp) {1079if(ce_stage(ce)) {1080/*1081 * If we skip unmerged index1082 * entries, we'll skip this1083 * entry *and* the tree1084 * entries associated with it!1085 */1086if(o->skip_unmerged) {1087add_same_unmerged(ce, o);1088return mask;1089}1090}1091 src[0] = ce;1092}1093break;1094}1095}10961097if(unpack_nondirectories(n, mask, dirmask, src, names, info) <0)1098return-1;10991100if(o->merge && src[0]) {1101if(ce_stage(src[0]))1102mark_ce_used_same_name(src[0], o);1103else1104mark_ce_used(src[0], o);1105}11061107/* Now handle any directories.. */1108if(dirmask) {1109/* special case: "diff-index --cached" looking at a tree */1110if(o->diff_index_cached &&1111 n ==1&& dirmask ==1&&S_ISDIR(names->mode)) {1112int matches;1113 matches =cache_tree_matches_traversal(o->src_index->cache_tree,1114 names, info);1115/*1116 * Everything under the name matches; skip the1117 * entire hierarchy. diff_index_cached codepath1118 * special cases D/F conflicts in such a way that1119 * it does not do any look-ahead, so this is safe.1120 */1121if(matches) {1122 o->cache_bottom += matches;1123return mask;1124}1125}11261127if(traverse_trees_recursive(n, dirmask, mask & ~dirmask,1128 names, info) <0)1129return-1;1130return mask;1131}11321133return mask;1134}11351136static intclear_ce_flags_1(struct cache_entry **cache,int nr,1137struct strbuf *prefix,1138int select_mask,int clear_mask,1139struct exclude_list *el,int defval);11401141/* Whole directory matching */1142static intclear_ce_flags_dir(struct cache_entry **cache,int nr,1143struct strbuf *prefix,1144char*basename,1145int select_mask,int clear_mask,1146struct exclude_list *el,int defval)1147{1148struct cache_entry **cache_end;1149int dtype = DT_DIR;1150int ret =is_excluded_from_list(prefix->buf, prefix->len,1151 basename, &dtype, el, &the_index);1152int rc;11531154strbuf_addch(prefix,'/');11551156/* If undecided, use matching result of parent dir in defval */1157if(ret <0)1158 ret = defval;11591160for(cache_end = cache; cache_end != cache + nr; cache_end++) {1161struct cache_entry *ce = *cache_end;1162if(strncmp(ce->name, prefix->buf, prefix->len))1163break;1164}11651166/*1167 * TODO: check el, if there are no patterns that may conflict1168 * with ret (iow, we know in advance the incl/excl1169 * decision for the entire directory), clear flag here without1170 * calling clear_ce_flags_1(). That function will call1171 * the expensive is_excluded_from_list() on every entry.1172 */1173 rc =clear_ce_flags_1(cache, cache_end - cache,1174 prefix,1175 select_mask, clear_mask,1176 el, ret);1177strbuf_setlen(prefix, prefix->len -1);1178return rc;1179}11801181/*1182 * Traverse the index, find every entry that matches according to1183 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the1184 * number of traversed entries.1185 *1186 * If select_mask is non-zero, only entries whose ce_flags has on of1187 * those bits enabled are traversed.1188 *1189 * cache : pointer to an index entry1190 * prefix_len : an offset to its path1191 *1192 * The current path ("prefix") including the trailing '/' is1193 * cache[0]->name[0..(prefix_len-1)]1194 * Top level path has prefix_len zero.1195 */1196static intclear_ce_flags_1(struct cache_entry **cache,int nr,1197struct strbuf *prefix,1198int select_mask,int clear_mask,1199struct exclude_list *el,int defval)1200{1201struct cache_entry **cache_end = cache + nr;12021203/*1204 * Process all entries that have the given prefix and meet1205 * select_mask condition1206 */1207while(cache != cache_end) {1208struct cache_entry *ce = *cache;1209const char*name, *slash;1210int len, dtype, ret;12111212if(select_mask && !(ce->ce_flags & select_mask)) {1213 cache++;1214continue;1215}12161217if(prefix->len &&strncmp(ce->name, prefix->buf, prefix->len))1218break;12191220 name = ce->name + prefix->len;1221 slash =strchr(name,'/');12221223/* If it's a directory, try whole directory match first */1224if(slash) {1225int processed;12261227 len = slash - name;1228strbuf_add(prefix, name, len);12291230 processed =clear_ce_flags_dir(cache, cache_end - cache,1231 prefix,1232 prefix->buf + prefix->len - len,1233 select_mask, clear_mask,1234 el, defval);12351236/* clear_c_f_dir eats a whole dir already? */1237if(processed) {1238 cache += processed;1239strbuf_setlen(prefix, prefix->len - len);1240continue;1241}12421243strbuf_addch(prefix,'/');1244 cache +=clear_ce_flags_1(cache, cache_end - cache,1245 prefix,1246 select_mask, clear_mask, el, defval);1247strbuf_setlen(prefix, prefix->len - len -1);1248continue;1249}12501251/* Non-directory */1252 dtype =ce_to_dtype(ce);1253 ret =is_excluded_from_list(ce->name,ce_namelen(ce),1254 name, &dtype, el, &the_index);1255if(ret <0)1256 ret = defval;1257if(ret >0)1258 ce->ce_flags &= ~clear_mask;1259 cache++;1260}1261return nr - (cache_end - cache);1262}12631264static intclear_ce_flags(struct cache_entry **cache,int nr,1265int select_mask,int clear_mask,1266struct exclude_list *el)1267{1268static struct strbuf prefix = STRBUF_INIT;12691270strbuf_reset(&prefix);12711272returnclear_ce_flags_1(cache, nr,1273&prefix,1274 select_mask, clear_mask,1275 el,0);1276}12771278/*1279 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout1280 */1281static voidmark_new_skip_worktree(struct exclude_list *el,1282struct index_state *the_index,1283int select_flag,int skip_wt_flag)1284{1285int i;12861287/*1288 * 1. Pretend the narrowest worktree: only unmerged entries1289 * are checked out1290 */1291for(i =0; i < the_index->cache_nr; i++) {1292struct cache_entry *ce = the_index->cache[i];12931294if(select_flag && !(ce->ce_flags & select_flag))1295continue;12961297if(!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED))1298 ce->ce_flags |= skip_wt_flag;1299else1300 ce->ce_flags &= ~skip_wt_flag;1301}13021303/*1304 * 2. Widen worktree according to sparse-checkout file.1305 * Matched entries will have skip_wt_flag cleared (i.e. "in")1306 */1307clear_ce_flags(the_index->cache, the_index->cache_nr,1308 select_flag, skip_wt_flag, el);1309}13101311static intverify_absent(const struct cache_entry *,1312enum unpack_trees_error_types,1313struct unpack_trees_options *);1314/*1315 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the1316 * resulting index, -2 on failure to reflect the changes to the work tree.1317 *1318 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally1319 */1320intunpack_trees(unsigned len,struct tree_desc *t,struct unpack_trees_options *o)1321{1322int i, ret;1323static struct cache_entry *dfc;1324struct exclude_list el;13251326if(len > MAX_UNPACK_TREES)1327die("unpack_trees takes at most%dtrees", MAX_UNPACK_TREES);13281329memset(&el,0,sizeof(el));1330if(!core_apply_sparse_checkout || !o->update)1331 o->skip_sparse_checkout =1;1332if(!o->skip_sparse_checkout) {1333char*sparse =git_pathdup("info/sparse-checkout");1334if(add_excludes_from_file_to_list(sparse,"",0, &el, NULL) <0)1335 o->skip_sparse_checkout =1;1336else1337 o->el = ⪙1338free(sparse);1339}13401341memset(&o->result,0,sizeof(o->result));1342 o->result.initialized =1;1343 o->result.timestamp.sec = o->src_index->timestamp.sec;1344 o->result.timestamp.nsec = o->src_index->timestamp.nsec;1345 o->result.version = o->src_index->version;1346if(!o->src_index->split_index) {1347 o->result.split_index = NULL;1348}else if(o->src_index == o->dst_index) {1349/*1350 * o->dst_index (and thus o->src_index) will be discarded1351 * and overwritten with o->result at the end of this function,1352 * so just use src_index's split_index to avoid having to1353 * create a new one.1354 */1355 o->result.split_index = o->src_index->split_index;1356 o->result.split_index->refcount++;1357}else{1358 o->result.split_index =init_split_index(&o->result);1359}1360oidcpy(&o->result.oid, &o->src_index->oid);1361 o->merge_size = len;1362mark_all_ce_unused(o->src_index);13631364/*1365 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries1366 */1367if(!o->skip_sparse_checkout)1368mark_new_skip_worktree(o->el, o->src_index,0, CE_NEW_SKIP_WORKTREE);13691370if(!dfc)1371 dfc =xcalloc(1,cache_entry_size(0));1372 o->df_conflict_entry = dfc;13731374if(len) {1375const char*prefix = o->prefix ? o->prefix :"";1376struct traverse_info info;13771378setup_traverse_info(&info, prefix);1379 info.fn = unpack_callback;1380 info.data = o;1381 info.show_all_errors = o->show_all_errors;1382 info.pathspec = o->pathspec;13831384if(o->prefix) {1385/*1386 * Unpack existing index entries that sort before the1387 * prefix the tree is spliced into. Note that o->merge1388 * is always true in this case.1389 */1390while(1) {1391struct cache_entry *ce =next_cache_entry(o);1392if(!ce)1393break;1394if(ce_in_traverse_path(ce, &info))1395break;1396if(unpack_index_entry(ce, o) <0)1397goto return_failed;1398}1399}14001401if(traverse_trees(len, t, &info) <0)1402goto return_failed;1403}14041405/* Any left-over entries in the index? */1406if(o->merge) {1407while(1) {1408struct cache_entry *ce =next_cache_entry(o);1409if(!ce)1410break;1411if(unpack_index_entry(ce, o) <0)1412goto return_failed;1413}1414}1415mark_all_ce_unused(o->src_index);14161417if(o->trivial_merges_only && o->nontrivial_merge) {1418 ret =unpack_failed(o,"Merge requires file-level merging");1419goto done;1420}14211422if(!o->skip_sparse_checkout) {1423int empty_worktree =1;14241425/*1426 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #11427 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE1428 * so apply_sparse_checkout() won't attempt to remove it from worktree1429 */1430mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);14311432 ret =0;1433for(i =0; i < o->result.cache_nr; i++) {1434struct cache_entry *ce = o->result.cache[i];14351436/*1437 * Entries marked with CE_ADDED in merged_entry() do not have1438 * verify_absent() check (the check is effectively disabled1439 * because CE_NEW_SKIP_WORKTREE is set unconditionally).1440 *1441 * Do the real check now because we have had1442 * correct CE_NEW_SKIP_WORKTREE1443 */1444if(ce->ce_flags & CE_ADDED &&1445verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1446if(!o->show_all_errors)1447goto return_failed;1448 ret = -1;1449}14501451if(apply_sparse_checkout(&o->result, ce, o)) {1452if(!o->show_all_errors)1453goto return_failed;1454 ret = -1;1455}1456if(!ce_skip_worktree(ce))1457 empty_worktree =0;14581459}1460if(ret <0)1461goto return_failed;1462/*1463 * Sparse checkout is meant to narrow down checkout area1464 * but it does not make sense to narrow down to empty working1465 * tree. This is usually a mistake in sparse checkout rules.1466 * Do not allow users to do that.1467 */1468if(o->result.cache_nr && empty_worktree) {1469 ret =unpack_failed(o,"Sparse checkout leaves no entry on working directory");1470goto done;1471}1472}14731474 ret =check_updates(o) ? (-2) :0;1475if(o->dst_index) {1476if(!ret) {1477if(!o->result.cache_tree)1478 o->result.cache_tree =cache_tree();1479if(!cache_tree_fully_valid(o->result.cache_tree))1480cache_tree_update(&o->result,1481 WRITE_TREE_SILENT |1482 WRITE_TREE_REPAIR);1483}1484move_index_extensions(&o->result, o->src_index);1485discard_index(o->dst_index);1486*o->dst_index = o->result;1487}else{1488discard_index(&o->result);1489}1490 o->src_index = NULL;14911492done:1493clear_exclude_list(&el);1494return ret;14951496return_failed:1497if(o->show_all_errors)1498display_error_msgs(o);1499mark_all_ce_unused(o->src_index);1500 ret =unpack_failed(o, NULL);1501if(o->exiting_early)1502 ret =0;1503goto done;1504}15051506/* Here come the merge functions */15071508static intreject_merge(const struct cache_entry *ce,1509struct unpack_trees_options *o)1510{1511return o->gently ? -1:1512add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);1513}15141515static intsame(const struct cache_entry *a,const struct cache_entry *b)1516{1517if(!!a != !!b)1518return0;1519if(!a && !b)1520return1;1521if((a->ce_flags | b->ce_flags) & CE_CONFLICTED)1522return0;1523return a->ce_mode == b->ce_mode &&1524!oidcmp(&a->oid, &b->oid);1525}152615271528/*1529 * When a CE gets turned into an unmerged entry, we1530 * want it to be up-to-date1531 */1532static intverify_uptodate_1(const struct cache_entry *ce,1533struct unpack_trees_options *o,1534enum unpack_trees_error_types error_type)1535{1536struct stat st;15371538if(o->index_only)1539return0;15401541/*1542 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again1543 * if this entry is truly up-to-date because this file may be1544 * overwritten.1545 */1546if((ce->ce_flags & CE_VALID) ||ce_skip_worktree(ce))1547;/* keep checking */1548else if(o->reset ||ce_uptodate(ce))1549return0;15501551if(!lstat(ce->name, &st)) {1552int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;1553unsigned changed =ie_match_stat(o->src_index, ce, &st, flags);15541555if(submodule_from_ce(ce)) {1556int r =check_submodule_move_head(ce,1557"HEAD",oid_to_hex(&ce->oid), o);1558if(r)1559return o->gently ? -1:1560add_rejected_path(o, error_type, ce->name);1561return0;1562}15631564if(!changed)1565return0;1566/*1567 * Historic default policy was to allow submodule to be out1568 * of sync wrt the superproject index. If the submodule was1569 * not considered interesting above, we don't care here.1570 */1571if(S_ISGITLINK(ce->ce_mode))1572return0;15731574 errno =0;1575}1576if(errno == ENOENT)1577return0;1578return o->gently ? -1:1579add_rejected_path(o, error_type, ce->name);1580}15811582intverify_uptodate(const struct cache_entry *ce,1583struct unpack_trees_options *o)1584{1585if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1586return0;1587returnverify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);1588}15891590static intverify_uptodate_sparse(const struct cache_entry *ce,1591struct unpack_trees_options *o)1592{1593returnverify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);1594}15951596static voidinvalidate_ce_path(const struct cache_entry *ce,1597struct unpack_trees_options *o)1598{1599if(!ce)1600return;1601cache_tree_invalidate_path(o->src_index, ce->name);1602untracked_cache_invalidate_path(o->src_index, ce->name,1);1603}16041605/*1606 * Check that checking out ce->sha1 in subdir ce->name is not1607 * going to overwrite any working files.1608 *1609 * Currently, git does not checkout subprojects during a superproject1610 * checkout, so it is not going to overwrite anything.1611 */1612static intverify_clean_submodule(const char*old_sha1,1613const struct cache_entry *ce,1614enum unpack_trees_error_types error_type,1615struct unpack_trees_options *o)1616{1617if(!submodule_from_ce(ce))1618return0;16191620returncheck_submodule_move_head(ce, old_sha1,1621oid_to_hex(&ce->oid), o);1622}16231624static intverify_clean_subdirectory(const struct cache_entry *ce,1625enum unpack_trees_error_types error_type,1626struct unpack_trees_options *o)1627{1628/*1629 * we are about to extract "ce->name"; we would not want to lose1630 * anything in the existing directory there.1631 */1632int namelen;1633int i;1634struct dir_struct d;1635char*pathbuf;1636int cnt =0;16371638if(S_ISGITLINK(ce->ce_mode)) {1639struct object_id oid;1640int sub_head =resolve_gitlink_ref(ce->name,"HEAD", &oid);1641/*1642 * If we are not going to update the submodule, then1643 * we don't care.1644 */1645if(!sub_head && !oidcmp(&oid, &ce->oid))1646return0;1647returnverify_clean_submodule(sub_head ? NULL :oid_to_hex(&oid),1648 ce, error_type, o);1649}16501651/*1652 * First let's make sure we do not have a local modification1653 * in that directory.1654 */1655 namelen =ce_namelen(ce);1656for(i =locate_in_src_index(ce, o);1657 i < o->src_index->cache_nr;1658 i++) {1659struct cache_entry *ce2 = o->src_index->cache[i];1660int len =ce_namelen(ce2);1661if(len < namelen ||1662strncmp(ce->name, ce2->name, namelen) ||1663 ce2->name[namelen] !='/')1664break;1665/*1666 * ce2->name is an entry in the subdirectory to be1667 * removed.1668 */1669if(!ce_stage(ce2)) {1670if(verify_uptodate(ce2, o))1671return-1;1672add_entry(o, ce2, CE_REMOVE,0);1673mark_ce_used(ce2, o);1674}1675 cnt++;1676}16771678/*1679 * Then we need to make sure that we do not lose a locally1680 * present file that is not ignored.1681 */1682 pathbuf =xstrfmt("%.*s/", namelen, ce->name);16831684memset(&d,0,sizeof(d));1685if(o->dir)1686 d.exclude_per_dir = o->dir->exclude_per_dir;1687 i =read_directory(&d, &the_index, pathbuf, namelen+1, NULL);1688if(i)1689return o->gently ? -1:1690add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);1691free(pathbuf);1692return cnt;1693}16941695/*1696 * This gets called when there was no index entry for the tree entry 'dst',1697 * but we found a file in the working tree that 'lstat()' said was fine,1698 * and we're on a case-insensitive filesystem.1699 *1700 * See if we can find a case-insensitive match in the index that also1701 * matches the stat information, and assume it's that other file!1702 */1703static inticase_exists(struct unpack_trees_options *o,const char*name,int len,struct stat *st)1704{1705const struct cache_entry *src;17061707 src =index_file_exists(o->src_index, name, len,1);1708return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);1709}17101711static intcheck_ok_to_remove(const char*name,int len,int dtype,1712const struct cache_entry *ce,struct stat *st,1713enum unpack_trees_error_types error_type,1714struct unpack_trees_options *o)1715{1716const struct cache_entry *result;17171718/*1719 * It may be that the 'lstat()' succeeded even though1720 * target 'ce' was absent, because there is an old1721 * entry that is different only in case..1722 *1723 * Ignore that lstat() if it matches.1724 */1725if(ignore_case &&icase_exists(o, name, len, st))1726return0;17271728if(o->dir &&1729is_excluded(o->dir, &the_index, name, &dtype))1730/*1731 * ce->name is explicitly excluded, so it is Ok to1732 * overwrite it.1733 */1734return0;1735if(S_ISDIR(st->st_mode)) {1736/*1737 * We are checking out path "foo" and1738 * found "foo/." in the working tree.1739 * This is tricky -- if we have modified1740 * files that are in "foo/" we would lose1741 * them.1742 */1743if(verify_clean_subdirectory(ce, error_type, o) <0)1744return-1;1745return0;1746}17471748/*1749 * The previous round may already have decided to1750 * delete this path, which is in a subdirectory that1751 * is being replaced with a blob.1752 */1753 result =index_file_exists(&o->result, name, len,0);1754if(result) {1755if(result->ce_flags & CE_REMOVE)1756return0;1757}17581759return o->gently ? -1:1760add_rejected_path(o, error_type, name);1761}17621763/*1764 * We do not want to remove or overwrite a working tree file that1765 * is not tracked, unless it is ignored.1766 */1767static intverify_absent_1(const struct cache_entry *ce,1768enum unpack_trees_error_types error_type,1769struct unpack_trees_options *o)1770{1771int len;1772struct stat st;17731774if(o->index_only || o->reset || !o->update)1775return0;17761777 len =check_leading_path(ce->name,ce_namelen(ce));1778if(!len)1779return0;1780else if(len >0) {1781char*path;1782int ret;17831784 path =xmemdupz(ce->name, len);1785if(lstat(path, &st))1786 ret =error_errno("cannot stat '%s'", path);1787else{1788if(submodule_from_ce(ce))1789 ret =check_submodule_move_head(ce,1790oid_to_hex(&ce->oid),1791 NULL, o);1792else1793 ret =check_ok_to_remove(path, len, DT_UNKNOWN, NULL,1794&st, error_type, o);1795}1796free(path);1797return ret;1798}else if(lstat(ce->name, &st)) {1799if(errno != ENOENT)1800returnerror_errno("cannot stat '%s'", ce->name);1801return0;1802}else{1803if(submodule_from_ce(ce))1804returncheck_submodule_move_head(ce,oid_to_hex(&ce->oid),1805 NULL, o);18061807returncheck_ok_to_remove(ce->name,ce_namelen(ce),1808ce_to_dtype(ce), ce, &st,1809 error_type, o);1810}1811}18121813static intverify_absent(const struct cache_entry *ce,1814enum unpack_trees_error_types error_type,1815struct unpack_trees_options *o)1816{1817if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1818return0;1819returnverify_absent_1(ce, error_type, o);1820}18211822static intverify_absent_sparse(const struct cache_entry *ce,1823enum unpack_trees_error_types error_type,1824struct unpack_trees_options *o)1825{1826enum unpack_trees_error_types orphaned_error = error_type;1827if(orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)1828 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;18291830returnverify_absent_1(ce, orphaned_error, o);1831}18321833static intmerged_entry(const struct cache_entry *ce,1834const struct cache_entry *old,1835struct unpack_trees_options *o)1836{1837int update = CE_UPDATE;1838struct cache_entry *merge =dup_entry(ce);18391840if(!old) {1841/*1842 * New index entries. In sparse checkout, the following1843 * verify_absent() will be delayed until after1844 * traverse_trees() finishes in unpack_trees(), then:1845 *1846 * - CE_NEW_SKIP_WORKTREE will be computed correctly1847 * - verify_absent() be called again, this time with1848 * correct CE_NEW_SKIP_WORKTREE1849 *1850 * verify_absent() call here does nothing in sparse1851 * checkout (i.e. o->skip_sparse_checkout == 0)1852 */1853 update |= CE_ADDED;1854 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;18551856if(verify_absent(merge,1857 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1858free(merge);1859return-1;1860}1861invalidate_ce_path(merge, o);18621863if(submodule_from_ce(ce)) {1864int ret =check_submodule_move_head(ce, NULL,1865oid_to_hex(&ce->oid),1866 o);1867if(ret)1868return ret;1869}18701871}else if(!(old->ce_flags & CE_CONFLICTED)) {1872/*1873 * See if we can re-use the old CE directly?1874 * That way we get the uptodate stat info.1875 *1876 * This also removes the UPDATE flag on a match; otherwise1877 * we will end up overwriting local changes in the work tree.1878 */1879if(same(old, merge)) {1880copy_cache_entry(merge, old);1881 update =0;1882}else{1883if(verify_uptodate(old, o)) {1884free(merge);1885return-1;1886}1887/* Migrate old flags over */1888 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);1889invalidate_ce_path(old, o);1890}18911892if(submodule_from_ce(ce)) {1893int ret =check_submodule_move_head(ce,oid_to_hex(&old->oid),1894oid_to_hex(&ce->oid),1895 o);1896if(ret)1897return ret;1898}1899}else{1900/*1901 * Previously unmerged entry left as an existence1902 * marker by read_index_unmerged();1903 */1904invalidate_ce_path(old, o);1905}19061907do_add_entry(o, merge, update, CE_STAGEMASK);1908return1;1909}19101911static intdeleted_entry(const struct cache_entry *ce,1912const struct cache_entry *old,1913struct unpack_trees_options *o)1914{1915/* Did it exist in the index? */1916if(!old) {1917if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))1918return-1;1919return0;1920}1921if(!(old->ce_flags & CE_CONFLICTED) &&verify_uptodate(old, o))1922return-1;1923add_entry(o, ce, CE_REMOVE,0);1924invalidate_ce_path(ce, o);1925return1;1926}19271928static intkeep_entry(const struct cache_entry *ce,1929struct unpack_trees_options *o)1930{1931add_entry(o, ce,0,0);1932return1;1933}19341935#if DBRT_DEBUG1936static voidshow_stage_entry(FILE*o,1937const char*label,const struct cache_entry *ce)1938{1939if(!ce)1940fprintf(o,"%s(missing)\n", label);1941else1942fprintf(o,"%s%06o%s %d\t%s\n",1943 label,1944 ce->ce_mode,1945oid_to_hex(&ce->oid),1946ce_stage(ce),1947 ce->name);1948}1949#endif19501951intthreeway_merge(const struct cache_entry *const*stages,1952struct unpack_trees_options *o)1953{1954const struct cache_entry *index;1955const struct cache_entry *head;1956const struct cache_entry *remote = stages[o->head_idx +1];1957int count;1958int head_match =0;1959int remote_match =0;19601961int df_conflict_head =0;1962int df_conflict_remote =0;19631964int any_anc_missing =0;1965int no_anc_exists =1;1966int i;19671968for(i =1; i < o->head_idx; i++) {1969if(!stages[i] || stages[i] == o->df_conflict_entry)1970 any_anc_missing =1;1971else1972 no_anc_exists =0;1973}19741975 index = stages[0];1976 head = stages[o->head_idx];19771978if(head == o->df_conflict_entry) {1979 df_conflict_head =1;1980 head = NULL;1981}19821983if(remote == o->df_conflict_entry) {1984 df_conflict_remote =1;1985 remote = NULL;1986}19871988/*1989 * First, if there's a #16 situation, note that to prevent #131990 * and #14.1991 */1992if(!same(remote, head)) {1993for(i =1; i < o->head_idx; i++) {1994if(same(stages[i], head)) {1995 head_match = i;1996}1997if(same(stages[i], remote)) {1998 remote_match = i;1999}2000}2001}20022003/*2004 * We start with cases where the index is allowed to match2005 * something other than the head: #14(ALT) and #2ALT, where it2006 * is permitted to match the result instead.2007 */2008/* #14, #14ALT, #2ALT */2009if(remote && !df_conflict_head && head_match && !remote_match) {2010if(index && !same(index, remote) && !same(index, head))2011returnreject_merge(index, o);2012returnmerged_entry(remote, index, o);2013}2014/*2015 * If we have an entry in the index cache, then we want to2016 * make sure that it matches head.2017 */2018if(index && !same(index, head))2019returnreject_merge(index, o);20202021if(head) {2022/* #5ALT, #15 */2023if(same(head, remote))2024returnmerged_entry(head, index, o);2025/* #13, #3ALT */2026if(!df_conflict_remote && remote_match && !head_match)2027returnmerged_entry(head, index, o);2028}20292030/* #1 */2031if(!head && !remote && any_anc_missing)2032return0;20332034/*2035 * Under the "aggressive" rule, we resolve mostly trivial2036 * cases that we historically had git-merge-one-file resolve.2037 */2038if(o->aggressive) {2039int head_deleted = !head;2040int remote_deleted = !remote;2041const struct cache_entry *ce = NULL;20422043if(index)2044 ce = index;2045else if(head)2046 ce = head;2047else if(remote)2048 ce = remote;2049else{2050for(i =1; i < o->head_idx; i++) {2051if(stages[i] && stages[i] != o->df_conflict_entry) {2052 ce = stages[i];2053break;2054}2055}2056}20572058/*2059 * Deleted in both.2060 * Deleted in one and unchanged in the other.2061 */2062if((head_deleted && remote_deleted) ||2063(head_deleted && remote && remote_match) ||2064(remote_deleted && head && head_match)) {2065if(index)2066returndeleted_entry(index, index, o);2067if(ce && !head_deleted) {2068if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))2069return-1;2070}2071return0;2072}2073/*2074 * Added in both, identically.2075 */2076if(no_anc_exists && head && remote &&same(head, remote))2077returnmerged_entry(head, index, o);20782079}20802081/* Below are "no merge" cases, which require that the index be2082 * up-to-date to avoid the files getting overwritten with2083 * conflict resolution files.2084 */2085if(index) {2086if(verify_uptodate(index, o))2087return-1;2088}20892090 o->nontrivial_merge =1;20912092/* #2, #3, #4, #6, #7, #9, #10, #11. */2093 count =0;2094if(!head_match || !remote_match) {2095for(i =1; i < o->head_idx; i++) {2096if(stages[i] && stages[i] != o->df_conflict_entry) {2097keep_entry(stages[i], o);2098 count++;2099break;2100}2101}2102}2103#if DBRT_DEBUG2104else{2105fprintf(stderr,"read-tree: warning #16 detected\n");2106show_stage_entry(stderr,"head ", stages[head_match]);2107show_stage_entry(stderr,"remote ", stages[remote_match]);2108}2109#endif2110if(head) { count +=keep_entry(head, o); }2111if(remote) { count +=keep_entry(remote, o); }2112return count;2113}21142115/*2116 * Two-way merge.2117 *2118 * The rule is to "carry forward" what is in the index without losing2119 * information across a "fast-forward", favoring a successful merge2120 * over a merge failure when it makes sense. For details of the2121 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.2122 *2123 */2124inttwoway_merge(const struct cache_entry *const*src,2125struct unpack_trees_options *o)2126{2127const struct cache_entry *current = src[0];2128const struct cache_entry *oldtree = src[1];2129const struct cache_entry *newtree = src[2];21302131if(o->merge_size !=2)2132returnerror("Cannot do a twoway merge of%dtrees",2133 o->merge_size);21342135if(oldtree == o->df_conflict_entry)2136 oldtree = NULL;2137if(newtree == o->df_conflict_entry)2138 newtree = NULL;21392140if(current) {2141if(current->ce_flags & CE_CONFLICTED) {2142if(same(oldtree, newtree) || o->reset) {2143if(!newtree)2144returndeleted_entry(current, current, o);2145else2146returnmerged_entry(newtree, current, o);2147}2148returnreject_merge(current, o);2149}else if((!oldtree && !newtree) ||/* 4 and 5 */2150(!oldtree && newtree &&2151same(current, newtree)) ||/* 6 and 7 */2152(oldtree && newtree &&2153same(oldtree, newtree)) ||/* 14 and 15 */2154(oldtree && newtree &&2155!same(oldtree, newtree) &&/* 18 and 19 */2156same(current, newtree))) {2157returnkeep_entry(current, o);2158}else if(oldtree && !newtree &&same(current, oldtree)) {2159/* 10 or 11 */2160returndeleted_entry(oldtree, current, o);2161}else if(oldtree && newtree &&2162same(current, oldtree) && !same(current, newtree)) {2163/* 20 or 21 */2164returnmerged_entry(newtree, current, o);2165}else2166returnreject_merge(current, o);2167}2168else if(newtree) {2169if(oldtree && !o->initial_checkout) {2170/*2171 * deletion of the path was staged;2172 */2173if(same(oldtree, newtree))2174return1;2175returnreject_merge(oldtree, o);2176}2177returnmerged_entry(newtree, current, o);2178}2179returndeleted_entry(oldtree, current, o);2180}21812182/*2183 * Bind merge.2184 *2185 * Keep the index entries at stage0, collapse stage1 but make sure2186 * stage0 does not have anything there.2187 */2188intbind_merge(const struct cache_entry *const*src,2189struct unpack_trees_options *o)2190{2191const struct cache_entry *old = src[0];2192const struct cache_entry *a = src[1];21932194if(o->merge_size !=1)2195returnerror("Cannot do a bind merge of%dtrees",2196 o->merge_size);2197if(a && old)2198return o->gently ? -1:2199error(ERRORMSG(o, ERROR_BIND_OVERLAP),2200super_prefixed(a->name),2201super_prefixed(old->name));2202if(!a)2203returnkeep_entry(old, o);2204else2205returnmerged_entry(a, NULL, o);2206}22072208/*2209 * One-way merge.2210 *2211 * The rule is:2212 * - take the stat information from stage0, take the data from stage12213 */2214intoneway_merge(const struct cache_entry *const*src,2215struct unpack_trees_options *o)2216{2217const struct cache_entry *old = src[0];2218const struct cache_entry *a = src[1];22192220if(o->merge_size !=1)2221returnerror("Cannot do a oneway merge of%dtrees",2222 o->merge_size);22232224if(!a || a == o->df_conflict_entry)2225returndeleted_entry(old, old, o);22262227if(old &&same(old, a)) {2228int update =0;2229if(o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {2230struct stat st;2231if(lstat(old->name, &st) ||2232ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))2233 update |= CE_UPDATE;2234}2235if(o->update &&S_ISGITLINK(old->ce_mode) &&2236should_update_submodules() && !verify_uptodate(old, o))2237 update |= CE_UPDATE;2238add_entry(o, old, update,0);2239return0;2240}2241returnmerged_entry(a, old, o);2242}