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"fetch-object.h" 20 21/* 22 * Error messages expected by scripts out of plumbing commands such as 23 * read-tree. Non-scripted Porcelain is not required to use these messages 24 * and in fact are encouraged to reword them to better suit their particular 25 * situation better. See how "git checkout" and "git merge" replaces 26 * them using setup_unpack_trees_porcelain(), for example. 27 */ 28static const char*unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { 29/* ERROR_WOULD_OVERWRITE */ 30"Entry '%s' would be overwritten by merge. Cannot merge.", 31 32/* ERROR_NOT_UPTODATE_FILE */ 33"Entry '%s' not uptodate. Cannot merge.", 34 35/* ERROR_NOT_UPTODATE_DIR */ 36"Updating '%s' would lose untracked files in it", 37 38/* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */ 39"Untracked working tree file '%s' would be overwritten by merge.", 40 41/* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */ 42"Untracked working tree file '%s' would be removed by merge.", 43 44/* ERROR_BIND_OVERLAP */ 45"Entry '%s' overlaps with '%s'. Cannot bind.", 46 47/* ERROR_SPARSE_NOT_UPTODATE_FILE */ 48"Entry '%s' not uptodate. Cannot update sparse checkout.", 49 50/* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ 51"Working tree file '%s' would be overwritten by sparse checkout update.", 52 53/* ERROR_WOULD_LOSE_ORPHANED_REMOVED */ 54"Working tree file '%s' would be removed by sparse checkout update.", 55 56/* ERROR_WOULD_LOSE_SUBMODULE */ 57"Submodule '%s' cannot checkout new HEAD.", 58}; 59 60#define ERRORMSG(o,type) \ 61 ( ((o) && (o)->msgs[(type)]) \ 62 ? ((o)->msgs[(type)]) \ 63 : (unpack_plumbing_errors[(type)]) ) 64 65static const char*super_prefixed(const char*path) 66{ 67/* 68 * It is necessary and sufficient to have two static buffers 69 * here, as the return value of this function is fed to 70 * error() using the unpack_*_errors[] templates we see above. 71 */ 72static struct strbuf buf[2] = {STRBUF_INIT, STRBUF_INIT}; 73static int super_prefix_len = -1; 74static unsigned idx =ARRAY_SIZE(buf) -1; 75 76if(super_prefix_len <0) { 77const char*super_prefix =get_super_prefix(); 78if(!super_prefix) { 79 super_prefix_len =0; 80}else{ 81int i; 82for(i =0; i <ARRAY_SIZE(buf); i++) 83strbuf_addstr(&buf[i], super_prefix); 84 super_prefix_len = buf[0].len; 85} 86} 87 88if(!super_prefix_len) 89return path; 90 91if(++idx >=ARRAY_SIZE(buf)) 92 idx =0; 93 94strbuf_setlen(&buf[idx], super_prefix_len); 95strbuf_addstr(&buf[idx], path); 96 97return buf[idx].buf; 98} 99 100voidsetup_unpack_trees_porcelain(struct unpack_trees_options *opts, 101const char*cmd) 102{ 103int i; 104const char**msgs = opts->msgs; 105const char*msg; 106 107argv_array_init(&opts->msgs_to_free); 108 109if(!strcmp(cmd,"checkout")) 110 msg = advice_commit_before_merge 111?_("Your local changes to the following files would be overwritten by checkout:\n%%s" 112"Please commit your changes or stash them before you switch branches.") 113:_("Your local changes to the following files would be overwritten by checkout:\n%%s"); 114else if(!strcmp(cmd,"merge")) 115 msg = advice_commit_before_merge 116?_("Your local changes to the following files would be overwritten by merge:\n%%s" 117"Please commit your changes or stash them before you merge.") 118:_("Your local changes to the following files would be overwritten by merge:\n%%s"); 119else 120 msg = advice_commit_before_merge 121?_("Your local changes to the following files would be overwritten by%s:\n%%s" 122"Please commit your changes or stash them before you%s.") 123:_("Your local changes to the following files would be overwritten by%s:\n%%s"); 124 msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = 125argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); 126 127 msgs[ERROR_NOT_UPTODATE_DIR] = 128_("Updating the following directories would lose untracked files in them:\n%s"); 129 130if(!strcmp(cmd,"checkout")) 131 msg = advice_commit_before_merge 132?_("The following untracked working tree files would be removed by checkout:\n%%s" 133"Please move or remove them before you switch branches.") 134:_("The following untracked working tree files would be removed by checkout:\n%%s"); 135else if(!strcmp(cmd,"merge")) 136 msg = advice_commit_before_merge 137?_("The following untracked working tree files would be removed by merge:\n%%s" 138"Please move or remove them before you merge.") 139:_("The following untracked working tree files would be removed by merge:\n%%s"); 140else 141 msg = advice_commit_before_merge 142?_("The following untracked working tree files would be removed by%s:\n%%s" 143"Please move or remove them before you%s.") 144:_("The following untracked working tree files would be removed by%s:\n%%s"); 145 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = 146argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); 147 148if(!strcmp(cmd,"checkout")) 149 msg = advice_commit_before_merge 150?_("The following untracked working tree files would be overwritten by checkout:\n%%s" 151"Please move or remove them before you switch branches.") 152:_("The following untracked working tree files would be overwritten by checkout:\n%%s"); 153else if(!strcmp(cmd,"merge")) 154 msg = advice_commit_before_merge 155?_("The following untracked working tree files would be overwritten by merge:\n%%s" 156"Please move or remove them before you merge.") 157:_("The following untracked working tree files would be overwritten by merge:\n%%s"); 158else 159 msg = advice_commit_before_merge 160?_("The following untracked working tree files would be overwritten by%s:\n%%s" 161"Please move or remove them before you%s.") 162:_("The following untracked working tree files would be overwritten by%s:\n%%s"); 163 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = 164argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd); 165 166/* 167 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we 168 * cannot easily display it as a list. 169 */ 170 msgs[ERROR_BIND_OVERLAP] =_("Entry '%s' overlaps with '%s'. Cannot bind."); 171 172 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = 173_("Cannot update sparse checkout: the following entries are not up to date:\n%s"); 174 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = 175_("The following working tree files would be overwritten by sparse checkout update:\n%s"); 176 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = 177_("The following working tree files would be removed by sparse checkout update:\n%s"); 178 msgs[ERROR_WOULD_LOSE_SUBMODULE] = 179_("Cannot update submodule:\n%s"); 180 181 opts->show_all_errors =1; 182/* rejected paths may not have a static buffer */ 183for(i =0; i <ARRAY_SIZE(opts->unpack_rejects); i++) 184 opts->unpack_rejects[i].strdup_strings =1; 185} 186 187voidclear_unpack_trees_porcelain(struct unpack_trees_options *opts) 188{ 189argv_array_clear(&opts->msgs_to_free); 190memset(opts->msgs,0,sizeof(opts->msgs)); 191} 192 193static intdo_add_entry(struct unpack_trees_options *o,struct cache_entry *ce, 194unsigned int set,unsigned int clear) 195{ 196 clear |= CE_HASHED; 197 198if(set & CE_REMOVE) 199 set |= CE_WT_REMOVE; 200 201 ce->ce_flags = (ce->ce_flags & ~clear) | set; 202returnadd_index_entry(&o->result, ce, 203 ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); 204} 205 206static struct cache_entry *dup_entry(const struct cache_entry *ce,struct index_state *istate) 207{ 208unsigned int size =ce_size(ce); 209struct cache_entry *new_entry =make_empty_cache_entry(istate,ce_namelen(ce)); 210 211memcpy(new_entry, ce, size); 212return new_entry; 213} 214 215static voidadd_entry(struct unpack_trees_options *o, 216const struct cache_entry *ce, 217unsigned int set,unsigned int clear) 218{ 219do_add_entry(o,dup_entry(ce, &o->result), set, clear); 220} 221 222/* 223 * add error messages on path <path> 224 * corresponding to the type <e> with the message <msg> 225 * indicating if it should be display in porcelain or not 226 */ 227static intadd_rejected_path(struct unpack_trees_options *o, 228enum unpack_trees_error_types e, 229const char*path) 230{ 231if(!o->show_all_errors) 232returnerror(ERRORMSG(o, e),super_prefixed(path)); 233 234/* 235 * Otherwise, insert in a list for future display by 236 * display_error_msgs() 237 */ 238string_list_append(&o->unpack_rejects[e], path); 239return-1; 240} 241 242/* 243 * display all the error messages stored in a nice way 244 */ 245static voiddisplay_error_msgs(struct unpack_trees_options *o) 246{ 247int e, i; 248int something_displayed =0; 249for(e =0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { 250struct string_list *rejects = &o->unpack_rejects[e]; 251if(rejects->nr >0) { 252struct strbuf path = STRBUF_INIT; 253 something_displayed =1; 254for(i =0; i < rejects->nr; i++) 255strbuf_addf(&path,"\t%s\n", rejects->items[i].string); 256error(ERRORMSG(o, e),super_prefixed(path.buf)); 257strbuf_release(&path); 258} 259string_list_clear(rejects,0); 260} 261if(something_displayed) 262fprintf(stderr,_("Aborting\n")); 263} 264 265static intcheck_submodule_move_head(const struct cache_entry *ce, 266const char*old_id, 267const char*new_id, 268struct unpack_trees_options *o) 269{ 270unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN; 271const struct submodule *sub =submodule_from_ce(ce); 272 273if(!sub) 274return0; 275 276if(o->reset) 277 flags |= SUBMODULE_MOVE_HEAD_FORCE; 278 279if(submodule_move_head(ce->name, old_id, new_id, flags)) 280return o->gently ? -1: 281add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name); 282return0; 283} 284 285/* 286 * Preform the loading of the repository's gitmodules file. This function is 287 * used by 'check_update()' to perform loading of the gitmodules file in two 288 * differnt situations: 289 * (1) before removing entries from the working tree if the gitmodules file has 290 * been marked for removal. This situation is specified by 'state' == NULL. 291 * (2) before checking out entries to the working tree if the gitmodules file 292 * has been marked for update. This situation is specified by 'state' != NULL. 293 */ 294static voidload_gitmodules_file(struct index_state *index, 295struct checkout *state) 296{ 297int pos =index_name_pos(index, GITMODULES_FILE,strlen(GITMODULES_FILE)); 298 299if(pos >=0) { 300struct cache_entry *ce = index->cache[pos]; 301if(!state && ce->ce_flags & CE_WT_REMOVE) { 302repo_read_gitmodules(the_repository); 303}else if(state && (ce->ce_flags & CE_UPDATE)) { 304submodule_free(the_repository); 305checkout_entry(ce, state, NULL); 306repo_read_gitmodules(the_repository); 307} 308} 309} 310 311/* 312 * Unlink the last component and schedule the leading directories for 313 * removal, such that empty directories get removed. 314 */ 315static voidunlink_entry(const struct cache_entry *ce) 316{ 317const struct submodule *sub =submodule_from_ce(ce); 318if(sub) { 319/* state.force is set at the caller. */ 320submodule_move_head(ce->name,"HEAD", NULL, 321 SUBMODULE_MOVE_HEAD_FORCE); 322} 323if(!check_leading_path(ce->name,ce_namelen(ce))) 324return; 325if(remove_or_warn(ce->ce_mode, ce->name)) 326return; 327schedule_dir_for_removal(ce->name,ce_namelen(ce)); 328} 329 330static struct progress *get_progress(struct unpack_trees_options *o) 331{ 332unsigned cnt =0, total =0; 333struct index_state *index = &o->result; 334 335if(!o->update || !o->verbose_update) 336return NULL; 337 338for(; cnt < index->cache_nr; cnt++) { 339const struct cache_entry *ce = index->cache[cnt]; 340if(ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE)) 341 total++; 342} 343 344returnstart_delayed_progress(_("Checking out files"), total); 345} 346 347static intcheck_updates(struct unpack_trees_options *o) 348{ 349unsigned cnt =0; 350int errs =0; 351struct progress *progress = NULL; 352struct index_state *index = &o->result; 353struct checkout state = CHECKOUT_INIT; 354int i; 355 356 state.force =1; 357 state.quiet =1; 358 state.refresh_cache =1; 359 state.istate = index; 360 361 progress =get_progress(o); 362 363if(o->update) 364git_attr_set_direction(GIT_ATTR_CHECKOUT, index); 365 366if(should_update_submodules() && o->update && !o->dry_run) 367load_gitmodules_file(index, NULL); 368 369for(i =0; i < index->cache_nr; i++) { 370const struct cache_entry *ce = index->cache[i]; 371 372if(ce->ce_flags & CE_WT_REMOVE) { 373display_progress(progress, ++cnt); 374if(o->update && !o->dry_run) 375unlink_entry(ce); 376} 377} 378remove_marked_cache_entries(index); 379remove_scheduled_dirs(); 380 381if(should_update_submodules() && o->update && !o->dry_run) 382load_gitmodules_file(index, &state); 383 384enable_delayed_checkout(&state); 385if(repository_format_partial_clone && o->update && !o->dry_run) { 386/* 387 * Prefetch the objects that are to be checked out in the loop 388 * below. 389 */ 390struct oid_array to_fetch = OID_ARRAY_INIT; 391int fetch_if_missing_store = fetch_if_missing; 392 fetch_if_missing =0; 393for(i =0; i < index->cache_nr; i++) { 394struct cache_entry *ce = index->cache[i]; 395if((ce->ce_flags & CE_UPDATE) && 396!S_ISGITLINK(ce->ce_mode)) { 397if(!has_object_file(&ce->oid)) 398oid_array_append(&to_fetch, &ce->oid); 399} 400} 401if(to_fetch.nr) 402fetch_objects(repository_format_partial_clone, 403&to_fetch); 404 fetch_if_missing = fetch_if_missing_store; 405oid_array_clear(&to_fetch); 406} 407for(i =0; i < index->cache_nr; i++) { 408struct cache_entry *ce = index->cache[i]; 409 410if(ce->ce_flags & CE_UPDATE) { 411if(ce->ce_flags & CE_WT_REMOVE) 412BUG("both update and delete flags are set on%s", 413 ce->name); 414display_progress(progress, ++cnt); 415 ce->ce_flags &= ~CE_UPDATE; 416if(o->update && !o->dry_run) { 417 errs |=checkout_entry(ce, &state, NULL); 418} 419} 420} 421stop_progress(&progress); 422 errs |=finish_delayed_checkout(&state); 423if(o->update) 424git_attr_set_direction(GIT_ATTR_CHECKIN, NULL); 425return errs !=0; 426} 427 428static intverify_uptodate_sparse(const struct cache_entry *ce, 429struct unpack_trees_options *o); 430static intverify_absent_sparse(const struct cache_entry *ce, 431enum unpack_trees_error_types, 432struct unpack_trees_options *o); 433 434static intapply_sparse_checkout(struct index_state *istate, 435struct cache_entry *ce, 436struct unpack_trees_options *o) 437{ 438int was_skip_worktree =ce_skip_worktree(ce); 439 440if(ce->ce_flags & CE_NEW_SKIP_WORKTREE) 441 ce->ce_flags |= CE_SKIP_WORKTREE; 442else 443 ce->ce_flags &= ~CE_SKIP_WORKTREE; 444if(was_skip_worktree !=ce_skip_worktree(ce)) { 445 ce->ce_flags |= CE_UPDATE_IN_BASE; 446mark_fsmonitor_invalid(istate, ce); 447 istate->cache_changed |= CE_ENTRY_CHANGED; 448} 449 450/* 451 * if (!was_skip_worktree && !ce_skip_worktree()) { 452 * This is perfectly normal. Move on; 453 * } 454 */ 455 456/* 457 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout 458 * area as a result of ce_skip_worktree() shortcuts in 459 * verify_absent() and verify_uptodate(). 460 * Make sure they don't modify worktree if they are already 461 * outside checkout area 462 */ 463if(was_skip_worktree &&ce_skip_worktree(ce)) { 464 ce->ce_flags &= ~CE_UPDATE; 465 466/* 467 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also 468 * on to get that file removed from both index and worktree. 469 * If that file is already outside worktree area, don't 470 * bother remove it. 471 */ 472if(ce->ce_flags & CE_REMOVE) 473 ce->ce_flags &= ~CE_WT_REMOVE; 474} 475 476if(!was_skip_worktree &&ce_skip_worktree(ce)) { 477/* 478 * If CE_UPDATE is set, verify_uptodate() must be called already 479 * also stat info may have lost after merged_entry() so calling 480 * verify_uptodate() again may fail 481 */ 482if(!(ce->ce_flags & CE_UPDATE) &&verify_uptodate_sparse(ce, o)) 483return-1; 484 ce->ce_flags |= CE_WT_REMOVE; 485 ce->ce_flags &= ~CE_UPDATE; 486} 487if(was_skip_worktree && !ce_skip_worktree(ce)) { 488if(verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) 489return-1; 490 ce->ce_flags |= CE_UPDATE; 491} 492return0; 493} 494 495staticinlineintcall_unpack_fn(const struct cache_entry *const*src, 496struct unpack_trees_options *o) 497{ 498int ret = o->fn(src, o); 499if(ret >0) 500 ret =0; 501return ret; 502} 503 504static voidmark_ce_used(struct cache_entry *ce,struct unpack_trees_options *o) 505{ 506 ce->ce_flags |= CE_UNPACKED; 507 508if(o->cache_bottom < o->src_index->cache_nr && 509 o->src_index->cache[o->cache_bottom] == ce) { 510int bottom = o->cache_bottom; 511while(bottom < o->src_index->cache_nr && 512 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) 513 bottom++; 514 o->cache_bottom = bottom; 515} 516} 517 518static voidmark_all_ce_unused(struct index_state *index) 519{ 520int i; 521for(i =0; i < index->cache_nr; i++) 522 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE); 523} 524 525static intlocate_in_src_index(const struct cache_entry *ce, 526struct unpack_trees_options *o) 527{ 528struct index_state *index = o->src_index; 529int len =ce_namelen(ce); 530int pos =index_name_pos(index, ce->name, len); 531if(pos <0) 532 pos = -1- pos; 533return pos; 534} 535 536/* 537 * We call unpack_index_entry() with an unmerged cache entry 538 * only in diff-index, and it wants a single callback. Skip 539 * the other unmerged entry with the same name. 540 */ 541static voidmark_ce_used_same_name(struct cache_entry *ce, 542struct unpack_trees_options *o) 543{ 544struct index_state *index = o->src_index; 545int len =ce_namelen(ce); 546int pos; 547 548for(pos =locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { 549struct cache_entry *next = index->cache[pos]; 550if(len !=ce_namelen(next) || 551memcmp(ce->name, next->name, len)) 552break; 553mark_ce_used(next, o); 554} 555} 556 557static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) 558{ 559const struct index_state *index = o->src_index; 560int pos = o->cache_bottom; 561 562while(pos < index->cache_nr) { 563struct cache_entry *ce = index->cache[pos]; 564if(!(ce->ce_flags & CE_UNPACKED)) 565return ce; 566 pos++; 567} 568return NULL; 569} 570 571static voidadd_same_unmerged(const struct cache_entry *ce, 572struct unpack_trees_options *o) 573{ 574struct index_state *index = o->src_index; 575int len =ce_namelen(ce); 576int pos =index_name_pos(index, ce->name, len); 577 578if(0<= pos) 579die("programming error in a caller of mark_ce_used_same_name"); 580for(pos = -pos -1; pos < index->cache_nr; pos++) { 581struct cache_entry *next = index->cache[pos]; 582if(len !=ce_namelen(next) || 583memcmp(ce->name, next->name, len)) 584break; 585add_entry(o, next,0,0); 586mark_ce_used(next, o); 587} 588} 589 590static intunpack_index_entry(struct cache_entry *ce, 591struct unpack_trees_options *o) 592{ 593const struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, }; 594int ret; 595 596 src[0] = ce; 597 598mark_ce_used(ce, o); 599if(ce_stage(ce)) { 600if(o->skip_unmerged) { 601add_entry(o, ce,0,0); 602return0; 603} 604} 605 ret =call_unpack_fn(src, o); 606if(ce_stage(ce)) 607mark_ce_used_same_name(ce, o); 608return ret; 609} 610 611static intfind_cache_pos(struct traverse_info *,const struct name_entry *); 612 613static voidrestore_cache_bottom(struct traverse_info *info,int bottom) 614{ 615struct unpack_trees_options *o = info->data; 616 617if(o->diff_index_cached) 618return; 619 o->cache_bottom = bottom; 620} 621 622static intswitch_cache_bottom(struct traverse_info *info) 623{ 624struct unpack_trees_options *o = info->data; 625int ret, pos; 626 627if(o->diff_index_cached) 628return0; 629 ret = o->cache_bottom; 630 pos =find_cache_pos(info->prev, &info->name); 631 632if(pos < -1) 633 o->cache_bottom = -2- pos; 634else if(pos <0) 635 o->cache_bottom = o->src_index->cache_nr; 636return ret; 637} 638 639staticinlineintare_same_oid(struct name_entry *name_j,struct name_entry *name_k) 640{ 641return name_j->oid && name_k->oid && !oidcmp(name_j->oid, name_k->oid); 642} 643 644static inttraverse_trees_recursive(int n,unsigned long dirmask, 645unsigned long df_conflicts, 646struct name_entry *names, 647struct traverse_info *info) 648{ 649int i, ret, bottom; 650int nr_buf =0; 651struct tree_desc t[MAX_UNPACK_TREES]; 652void*buf[MAX_UNPACK_TREES]; 653struct traverse_info newinfo; 654struct name_entry *p; 655 656 p = names; 657while(!p->mode) 658 p++; 659 660 newinfo = *info; 661 newinfo.prev = info; 662 newinfo.pathspec = info->pathspec; 663 newinfo.name = *p; 664 newinfo.pathlen +=tree_entry_len(p) +1; 665 newinfo.df_conflicts |= df_conflicts; 666 667/* 668 * Fetch the tree from the ODB for each peer directory in the 669 * n commits. 670 * 671 * For 2- and 3-way traversals, we try to avoid hitting the 672 * ODB twice for the same OID. This should yield a nice speed 673 * up in checkouts and merges when the commits are similar. 674 * 675 * We don't bother doing the full O(n^2) search for larger n, 676 * because wider traversals don't happen that often and we 677 * avoid the search setup. 678 * 679 * When 2 peer OIDs are the same, we just copy the tree 680 * descriptor data. This implicitly borrows the buffer 681 * data from the earlier cell. 682 */ 683for(i =0; i < n; i++, dirmask >>=1) { 684if(i >0&&are_same_oid(&names[i], &names[i -1])) 685 t[i] = t[i -1]; 686else if(i >1&&are_same_oid(&names[i], &names[i -2])) 687 t[i] = t[i -2]; 688else{ 689const struct object_id *oid = NULL; 690if(dirmask &1) 691 oid = names[i].oid; 692 buf[nr_buf++] =fill_tree_descriptor(t + i, oid); 693} 694} 695 696 bottom =switch_cache_bottom(&newinfo); 697 ret =traverse_trees(n, t, &newinfo); 698restore_cache_bottom(&newinfo, bottom); 699 700for(i =0; i < nr_buf; i++) 701free(buf[i]); 702 703return ret; 704} 705 706/* 707 * Compare the traverse-path to the cache entry without actually 708 * having to generate the textual representation of the traverse 709 * path. 710 * 711 * NOTE! This *only* compares up to the size of the traverse path 712 * itself - the caller needs to do the final check for the cache 713 * entry having more data at the end! 714 */ 715static intdo_compare_entry_piecewise(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 716{ 717int len, pathlen, ce_len; 718const char*ce_name; 719 720if(info->prev) { 721int cmp =do_compare_entry_piecewise(ce, info->prev, 722&info->name); 723if(cmp) 724return cmp; 725} 726 pathlen = info->pathlen; 727 ce_len =ce_namelen(ce); 728 729/* If ce_len < pathlen then we must have previously hit "name == directory" entry */ 730if(ce_len < pathlen) 731return-1; 732 733 ce_len -= pathlen; 734 ce_name = ce->name + pathlen; 735 736 len =tree_entry_len(n); 737returndf_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 738} 739 740static intdo_compare_entry(const struct cache_entry *ce, 741const struct traverse_info *info, 742const struct name_entry *n) 743{ 744int len, pathlen, ce_len; 745const char*ce_name; 746int cmp; 747 748/* 749 * If we have not precomputed the traverse path, it is quicker 750 * to avoid doing so. But if we have precomputed it, 751 * it is quicker to use the precomputed version. 752 */ 753if(!info->traverse_path) 754returndo_compare_entry_piecewise(ce, info, n); 755 756 cmp =strncmp(ce->name, info->traverse_path, info->pathlen); 757if(cmp) 758return cmp; 759 760 pathlen = info->pathlen; 761 ce_len =ce_namelen(ce); 762 763if(ce_len < pathlen) 764return-1; 765 766 ce_len -= pathlen; 767 ce_name = ce->name + pathlen; 768 769 len =tree_entry_len(n); 770returndf_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 771} 772 773static intcompare_entry(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 774{ 775int cmp =do_compare_entry(ce, info, n); 776if(cmp) 777return cmp; 778 779/* 780 * Even if the beginning compared identically, the ce should 781 * compare as bigger than a directory leading up to it! 782 */ 783returnce_namelen(ce) >traverse_path_len(info, n); 784} 785 786static intce_in_traverse_path(const struct cache_entry *ce, 787const struct traverse_info *info) 788{ 789if(!info->prev) 790return1; 791if(do_compare_entry(ce, info->prev, &info->name)) 792return0; 793/* 794 * If ce (blob) is the same name as the path (which is a tree 795 * we will be descending into), it won't be inside it. 796 */ 797return(info->pathlen <ce_namelen(ce)); 798} 799 800static struct cache_entry *create_ce_entry(const struct traverse_info *info, 801const struct name_entry *n, 802int stage, 803struct index_state *istate, 804int is_transient) 805{ 806int len =traverse_path_len(info, n); 807struct cache_entry *ce = 808 is_transient ? 809make_empty_transient_cache_entry(len) : 810make_empty_cache_entry(istate, len); 811 812 ce->ce_mode =create_ce_mode(n->mode); 813 ce->ce_flags =create_ce_flags(stage); 814 ce->ce_namelen = len; 815oidcpy(&ce->oid, n->oid); 816make_traverse_path(ce->name, info, n); 817 818return ce; 819} 820 821static intunpack_nondirectories(int n,unsigned long mask, 822unsigned long dirmask, 823struct cache_entry **src, 824const struct name_entry *names, 825const struct traverse_info *info) 826{ 827int i; 828struct unpack_trees_options *o = info->data; 829unsigned long conflicts = info->df_conflicts | dirmask; 830 831/* Do we have *only* directories? Nothing to do */ 832if(mask == dirmask && !src[0]) 833return0; 834 835/* 836 * Ok, we've filled in up to any potential index entry in src[0], 837 * now do the rest. 838 */ 839for(i =0; i < n; i++) { 840int stage; 841unsigned int bit =1ul<< i; 842if(conflicts & bit) { 843 src[i + o->merge] = o->df_conflict_entry; 844continue; 845} 846if(!(mask & bit)) 847continue; 848if(!o->merge) 849 stage =0; 850else if(i +1< o->head_idx) 851 stage =1; 852else if(i +1> o->head_idx) 853 stage =3; 854else 855 stage =2; 856 857/* 858 * If the merge bit is set, then the cache entries are 859 * discarded in the following block. In this case, 860 * construct "transient" cache_entries, as they are 861 * not stored in the index. otherwise construct the 862 * cache entry from the index aware logic. 863 */ 864 src[i + o->merge] =create_ce_entry(info, names + i, stage, &o->result, o->merge); 865} 866 867if(o->merge) { 868int rc =call_unpack_fn((const struct cache_entry *const*)src, 869 o); 870for(i =0; i < n; i++) { 871struct cache_entry *ce = src[i + o->merge]; 872if(ce != o->df_conflict_entry) 873discard_cache_entry(ce); 874} 875return rc; 876} 877 878for(i =0; i < n; i++) 879if(src[i] && src[i] != o->df_conflict_entry) 880if(do_add_entry(o, src[i],0,0)) 881return-1; 882 883return0; 884} 885 886static intunpack_failed(struct unpack_trees_options *o,const char*message) 887{ 888discard_index(&o->result); 889if(!o->gently && !o->exiting_early) { 890if(message) 891returnerror("%s", message); 892return-1; 893} 894return-1; 895} 896 897/* 898 * The tree traversal is looking at name p. If we have a matching entry, 899 * return it. If name p is a directory in the index, do not return 900 * anything, as we will want to match it when the traversal descends into 901 * the directory. 902 */ 903static intfind_cache_pos(struct traverse_info *info, 904const struct name_entry *p) 905{ 906int pos; 907struct unpack_trees_options *o = info->data; 908struct index_state *index = o->src_index; 909int pfxlen = info->pathlen; 910int p_len =tree_entry_len(p); 911 912for(pos = o->cache_bottom; pos < index->cache_nr; pos++) { 913const struct cache_entry *ce = index->cache[pos]; 914const char*ce_name, *ce_slash; 915int cmp, ce_len; 916 917if(ce->ce_flags & CE_UNPACKED) { 918/* 919 * cache_bottom entry is already unpacked, so 920 * we can never match it; don't check it 921 * again. 922 */ 923if(pos == o->cache_bottom) 924++o->cache_bottom; 925continue; 926} 927if(!ce_in_traverse_path(ce, info)) { 928/* 929 * Check if we can skip future cache checks 930 * (because we're already past all possible 931 * entries in the traverse path). 932 */ 933if(info->traverse_path) { 934if(strncmp(ce->name, info->traverse_path, 935 info->pathlen) >0) 936break; 937} 938continue; 939} 940 ce_name = ce->name + pfxlen; 941 ce_slash =strchr(ce_name,'/'); 942if(ce_slash) 943 ce_len = ce_slash - ce_name; 944else 945 ce_len =ce_namelen(ce) - pfxlen; 946 cmp =name_compare(p->path, p_len, ce_name, ce_len); 947/* 948 * Exact match; if we have a directory we need to 949 * delay returning it. 950 */ 951if(!cmp) 952return ce_slash ? -2- pos : pos; 953if(0< cmp) 954continue;/* keep looking */ 955/* 956 * ce_name sorts after p->path; could it be that we 957 * have files under p->path directory in the index? 958 * E.g. ce_name == "t-i", and p->path == "t"; we may 959 * have "t/a" in the index. 960 */ 961if(p_len < ce_len && !memcmp(ce_name, p->path, p_len) && 962 ce_name[p_len] <'/') 963continue;/* keep looking */ 964break; 965} 966return-1; 967} 968 969static struct cache_entry *find_cache_entry(struct traverse_info *info, 970const struct name_entry *p) 971{ 972int pos =find_cache_pos(info, p); 973struct unpack_trees_options *o = info->data; 974 975if(0<= pos) 976return o->src_index->cache[pos]; 977else 978return NULL; 979} 980 981static voiddebug_path(struct traverse_info *info) 982{ 983if(info->prev) { 984debug_path(info->prev); 985if(*info->prev->name.path) 986putchar('/'); 987} 988printf("%s", info->name.path); 989} 990 991static voiddebug_name_entry(int i,struct name_entry *n) 992{ 993printf("ent#%d %06o%s\n", i, 994 n->path ? n->mode :0, 995 n->path ? n->path :"(missing)"); 996} 997 998static voiddebug_unpack_callback(int n, 999unsigned long mask,1000unsigned long dirmask,1001struct name_entry *names,1002struct traverse_info *info)1003{1004int i;1005printf("* unpack mask%lu, dirmask%lu, cnt%d",1006 mask, dirmask, n);1007debug_path(info);1008putchar('\n');1009for(i =0; i < n; i++)1010debug_name_entry(i, names + i);1011}10121013static intunpack_callback(int n,unsigned long mask,unsigned long dirmask,struct name_entry *names,struct traverse_info *info)1014{1015struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, };1016struct unpack_trees_options *o = info->data;1017const struct name_entry *p = names;10181019/* Find first entry with a real name (we could use "mask" too) */1020while(!p->mode)1021 p++;10221023if(o->debug_unpack)1024debug_unpack_callback(n, mask, dirmask, names, info);10251026/* Are we supposed to look at the index too? */1027if(o->merge) {1028while(1) {1029int cmp;1030struct cache_entry *ce;10311032if(o->diff_index_cached)1033 ce =next_cache_entry(o);1034else1035 ce =find_cache_entry(info, p);10361037if(!ce)1038break;1039 cmp =compare_entry(ce, info, p);1040if(cmp <0) {1041if(unpack_index_entry(ce, o) <0)1042returnunpack_failed(o, NULL);1043continue;1044}1045if(!cmp) {1046if(ce_stage(ce)) {1047/*1048 * If we skip unmerged index1049 * entries, we'll skip this1050 * entry *and* the tree1051 * entries associated with it!1052 */1053if(o->skip_unmerged) {1054add_same_unmerged(ce, o);1055return mask;1056}1057}1058 src[0] = ce;1059}1060break;1061}1062}10631064if(unpack_nondirectories(n, mask, dirmask, src, names, info) <0)1065return-1;10661067if(o->merge && src[0]) {1068if(ce_stage(src[0]))1069mark_ce_used_same_name(src[0], o);1070else1071mark_ce_used(src[0], o);1072}10731074/* Now handle any directories.. */1075if(dirmask) {1076/* special case: "diff-index --cached" looking at a tree */1077if(o->diff_index_cached &&1078 n ==1&& dirmask ==1&&S_ISDIR(names->mode)) {1079int matches;1080 matches =cache_tree_matches_traversal(o->src_index->cache_tree,1081 names, info);1082/*1083 * Everything under the name matches; skip the1084 * entire hierarchy. diff_index_cached codepath1085 * special cases D/F conflicts in such a way that1086 * it does not do any look-ahead, so this is safe.1087 */1088if(matches) {1089 o->cache_bottom += matches;1090return mask;1091}1092}10931094if(traverse_trees_recursive(n, dirmask, mask & ~dirmask,1095 names, info) <0)1096return-1;1097return mask;1098}10991100return mask;1101}11021103static intclear_ce_flags_1(struct cache_entry **cache,int nr,1104struct strbuf *prefix,1105int select_mask,int clear_mask,1106struct exclude_list *el,int defval);11071108/* Whole directory matching */1109static intclear_ce_flags_dir(struct cache_entry **cache,int nr,1110struct strbuf *prefix,1111char*basename,1112int select_mask,int clear_mask,1113struct exclude_list *el,int defval)1114{1115struct cache_entry **cache_end;1116int dtype = DT_DIR;1117int ret =is_excluded_from_list(prefix->buf, prefix->len,1118 basename, &dtype, el, &the_index);1119int rc;11201121strbuf_addch(prefix,'/');11221123/* If undecided, use matching result of parent dir in defval */1124if(ret <0)1125 ret = defval;11261127for(cache_end = cache; cache_end != cache + nr; cache_end++) {1128struct cache_entry *ce = *cache_end;1129if(strncmp(ce->name, prefix->buf, prefix->len))1130break;1131}11321133/*1134 * TODO: check el, if there are no patterns that may conflict1135 * with ret (iow, we know in advance the incl/excl1136 * decision for the entire directory), clear flag here without1137 * calling clear_ce_flags_1(). That function will call1138 * the expensive is_excluded_from_list() on every entry.1139 */1140 rc =clear_ce_flags_1(cache, cache_end - cache,1141 prefix,1142 select_mask, clear_mask,1143 el, ret);1144strbuf_setlen(prefix, prefix->len -1);1145return rc;1146}11471148/*1149 * Traverse the index, find every entry that matches according to1150 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the1151 * number of traversed entries.1152 *1153 * If select_mask is non-zero, only entries whose ce_flags has on of1154 * those bits enabled are traversed.1155 *1156 * cache : pointer to an index entry1157 * prefix_len : an offset to its path1158 *1159 * The current path ("prefix") including the trailing '/' is1160 * cache[0]->name[0..(prefix_len-1)]1161 * Top level path has prefix_len zero.1162 */1163static intclear_ce_flags_1(struct cache_entry **cache,int nr,1164struct strbuf *prefix,1165int select_mask,int clear_mask,1166struct exclude_list *el,int defval)1167{1168struct cache_entry **cache_end = cache + nr;11691170/*1171 * Process all entries that have the given prefix and meet1172 * select_mask condition1173 */1174while(cache != cache_end) {1175struct cache_entry *ce = *cache;1176const char*name, *slash;1177int len, dtype, ret;11781179if(select_mask && !(ce->ce_flags & select_mask)) {1180 cache++;1181continue;1182}11831184if(prefix->len &&strncmp(ce->name, prefix->buf, prefix->len))1185break;11861187 name = ce->name + prefix->len;1188 slash =strchr(name,'/');11891190/* If it's a directory, try whole directory match first */1191if(slash) {1192int processed;11931194 len = slash - name;1195strbuf_add(prefix, name, len);11961197 processed =clear_ce_flags_dir(cache, cache_end - cache,1198 prefix,1199 prefix->buf + prefix->len - len,1200 select_mask, clear_mask,1201 el, defval);12021203/* clear_c_f_dir eats a whole dir already? */1204if(processed) {1205 cache += processed;1206strbuf_setlen(prefix, prefix->len - len);1207continue;1208}12091210strbuf_addch(prefix,'/');1211 cache +=clear_ce_flags_1(cache, cache_end - cache,1212 prefix,1213 select_mask, clear_mask, el, defval);1214strbuf_setlen(prefix, prefix->len - len -1);1215continue;1216}12171218/* Non-directory */1219 dtype =ce_to_dtype(ce);1220 ret =is_excluded_from_list(ce->name,ce_namelen(ce),1221 name, &dtype, el, &the_index);1222if(ret <0)1223 ret = defval;1224if(ret >0)1225 ce->ce_flags &= ~clear_mask;1226 cache++;1227}1228return nr - (cache_end - cache);1229}12301231static intclear_ce_flags(struct cache_entry **cache,int nr,1232int select_mask,int clear_mask,1233struct exclude_list *el)1234{1235static struct strbuf prefix = STRBUF_INIT;12361237strbuf_reset(&prefix);12381239returnclear_ce_flags_1(cache, nr,1240&prefix,1241 select_mask, clear_mask,1242 el,0);1243}12441245/*1246 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout1247 */1248static voidmark_new_skip_worktree(struct exclude_list *el,1249struct index_state *the_index,1250int select_flag,int skip_wt_flag)1251{1252int i;12531254/*1255 * 1. Pretend the narrowest worktree: only unmerged entries1256 * are checked out1257 */1258for(i =0; i < the_index->cache_nr; i++) {1259struct cache_entry *ce = the_index->cache[i];12601261if(select_flag && !(ce->ce_flags & select_flag))1262continue;12631264if(!ce_stage(ce))1265 ce->ce_flags |= skip_wt_flag;1266else1267 ce->ce_flags &= ~skip_wt_flag;1268}12691270/*1271 * 2. Widen worktree according to sparse-checkout file.1272 * Matched entries will have skip_wt_flag cleared (i.e. "in")1273 */1274clear_ce_flags(the_index->cache, the_index->cache_nr,1275 select_flag, skip_wt_flag, el);1276}12771278static intverify_absent(const struct cache_entry *,1279enum unpack_trees_error_types,1280struct unpack_trees_options *);1281/*1282 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the1283 * resulting index, -2 on failure to reflect the changes to the work tree.1284 *1285 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally1286 */1287intunpack_trees(unsigned len,struct tree_desc *t,struct unpack_trees_options *o)1288{1289int i, ret;1290static struct cache_entry *dfc;1291struct exclude_list el;12921293if(len > MAX_UNPACK_TREES)1294die("unpack_trees takes at most%dtrees", MAX_UNPACK_TREES);12951296memset(&el,0,sizeof(el));1297if(!core_apply_sparse_checkout || !o->update)1298 o->skip_sparse_checkout =1;1299if(!o->skip_sparse_checkout) {1300char*sparse =git_pathdup("info/sparse-checkout");1301if(add_excludes_from_file_to_list(sparse,"",0, &el, NULL) <0)1302 o->skip_sparse_checkout =1;1303else1304 o->el = ⪙1305free(sparse);1306}13071308memset(&o->result,0,sizeof(o->result));1309 o->result.initialized =1;1310 o->result.timestamp.sec = o->src_index->timestamp.sec;1311 o->result.timestamp.nsec = o->src_index->timestamp.nsec;1312 o->result.version = o->src_index->version;1313if(!o->src_index->split_index) {1314 o->result.split_index = NULL;1315}else if(o->src_index == o->dst_index) {1316/*1317 * o->dst_index (and thus o->src_index) will be discarded1318 * and overwritten with o->result at the end of this function,1319 * so just use src_index's split_index to avoid having to1320 * create a new one.1321 */1322 o->result.split_index = o->src_index->split_index;1323 o->result.split_index->refcount++;1324}else{1325 o->result.split_index =init_split_index(&o->result);1326}1327oidcpy(&o->result.oid, &o->src_index->oid);1328 o->merge_size = len;1329mark_all_ce_unused(o->src_index);13301331/*1332 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries1333 */1334if(!o->skip_sparse_checkout)1335mark_new_skip_worktree(o->el, o->src_index,0, CE_NEW_SKIP_WORKTREE);13361337if(!dfc)1338 dfc =xcalloc(1,cache_entry_size(0));1339 o->df_conflict_entry = dfc;13401341if(len) {1342const char*prefix = o->prefix ? o->prefix :"";1343struct traverse_info info;13441345setup_traverse_info(&info, prefix);1346 info.fn = unpack_callback;1347 info.data = o;1348 info.show_all_errors = o->show_all_errors;1349 info.pathspec = o->pathspec;13501351if(o->prefix) {1352/*1353 * Unpack existing index entries that sort before the1354 * prefix the tree is spliced into. Note that o->merge1355 * is always true in this case.1356 */1357while(1) {1358struct cache_entry *ce =next_cache_entry(o);1359if(!ce)1360break;1361if(ce_in_traverse_path(ce, &info))1362break;1363if(unpack_index_entry(ce, o) <0)1364goto return_failed;1365}1366}13671368if(traverse_trees(len, t, &info) <0)1369goto return_failed;1370}13711372/* Any left-over entries in the index? */1373if(o->merge) {1374while(1) {1375struct cache_entry *ce =next_cache_entry(o);1376if(!ce)1377break;1378if(unpack_index_entry(ce, o) <0)1379goto return_failed;1380}1381}1382mark_all_ce_unused(o->src_index);13831384if(o->trivial_merges_only && o->nontrivial_merge) {1385 ret =unpack_failed(o,"Merge requires file-level merging");1386goto done;1387}13881389if(!o->skip_sparse_checkout) {1390int empty_worktree =1;13911392/*1393 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #11394 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE1395 * so apply_sparse_checkout() won't attempt to remove it from worktree1396 */1397mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);13981399 ret =0;1400for(i =0; i < o->result.cache_nr; i++) {1401struct cache_entry *ce = o->result.cache[i];14021403/*1404 * Entries marked with CE_ADDED in merged_entry() do not have1405 * verify_absent() check (the check is effectively disabled1406 * because CE_NEW_SKIP_WORKTREE is set unconditionally).1407 *1408 * Do the real check now because we have had1409 * correct CE_NEW_SKIP_WORKTREE1410 */1411if(ce->ce_flags & CE_ADDED &&1412verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1413if(!o->show_all_errors)1414goto return_failed;1415 ret = -1;1416}14171418if(apply_sparse_checkout(&o->result, ce, o)) {1419if(!o->show_all_errors)1420goto return_failed;1421 ret = -1;1422}1423if(!ce_skip_worktree(ce))1424 empty_worktree =0;14251426}1427if(ret <0)1428goto return_failed;1429/*1430 * Sparse checkout is meant to narrow down checkout area1431 * but it does not make sense to narrow down to empty working1432 * tree. This is usually a mistake in sparse checkout rules.1433 * Do not allow users to do that.1434 */1435if(o->result.cache_nr && empty_worktree) {1436 ret =unpack_failed(o,"Sparse checkout leaves no entry on working directory");1437goto done;1438}1439}14401441 ret =check_updates(o) ? (-2) :0;1442if(o->dst_index) {1443if(!ret) {1444if(!o->result.cache_tree)1445 o->result.cache_tree =cache_tree();1446if(!cache_tree_fully_valid(o->result.cache_tree))1447cache_tree_update(&o->result,1448 WRITE_TREE_SILENT |1449 WRITE_TREE_REPAIR);1450}1451move_index_extensions(&o->result, o->src_index);1452discard_index(o->dst_index);1453*o->dst_index = o->result;1454}else{1455discard_index(&o->result);1456}1457 o->src_index = NULL;14581459done:1460clear_exclude_list(&el);1461return ret;14621463return_failed:1464if(o->show_all_errors)1465display_error_msgs(o);1466mark_all_ce_unused(o->src_index);1467 ret =unpack_failed(o, NULL);1468if(o->exiting_early)1469 ret =0;1470goto done;1471}14721473/* Here come the merge functions */14741475static intreject_merge(const struct cache_entry *ce,1476struct unpack_trees_options *o)1477{1478return o->gently ? -1:1479add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);1480}14811482static intsame(const struct cache_entry *a,const struct cache_entry *b)1483{1484if(!!a != !!b)1485return0;1486if(!a && !b)1487return1;1488if((a->ce_flags | b->ce_flags) & CE_CONFLICTED)1489return0;1490return a->ce_mode == b->ce_mode &&1491!oidcmp(&a->oid, &b->oid);1492}149314941495/*1496 * When a CE gets turned into an unmerged entry, we1497 * want it to be up-to-date1498 */1499static intverify_uptodate_1(const struct cache_entry *ce,1500struct unpack_trees_options *o,1501enum unpack_trees_error_types error_type)1502{1503struct stat st;15041505if(o->index_only)1506return0;15071508/*1509 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again1510 * if this entry is truly up-to-date because this file may be1511 * overwritten.1512 */1513if((ce->ce_flags & CE_VALID) ||ce_skip_worktree(ce))1514;/* keep checking */1515else if(o->reset ||ce_uptodate(ce))1516return0;15171518if(!lstat(ce->name, &st)) {1519int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;1520unsigned changed =ie_match_stat(o->src_index, ce, &st, flags);15211522if(submodule_from_ce(ce)) {1523int r =check_submodule_move_head(ce,1524"HEAD",oid_to_hex(&ce->oid), o);1525if(r)1526return o->gently ? -1:1527add_rejected_path(o, error_type, ce->name);1528return0;1529}15301531if(!changed)1532return0;1533/*1534 * Historic default policy was to allow submodule to be out1535 * of sync wrt the superproject index. If the submodule was1536 * not considered interesting above, we don't care here.1537 */1538if(S_ISGITLINK(ce->ce_mode))1539return0;15401541 errno =0;1542}1543if(errno == ENOENT)1544return0;1545return o->gently ? -1:1546add_rejected_path(o, error_type, ce->name);1547}15481549intverify_uptodate(const struct cache_entry *ce,1550struct unpack_trees_options *o)1551{1552if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1553return0;1554returnverify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);1555}15561557static intverify_uptodate_sparse(const struct cache_entry *ce,1558struct unpack_trees_options *o)1559{1560returnverify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);1561}15621563static voidinvalidate_ce_path(const struct cache_entry *ce,1564struct unpack_trees_options *o)1565{1566if(!ce)1567return;1568cache_tree_invalidate_path(o->src_index, ce->name);1569untracked_cache_invalidate_path(o->src_index, ce->name,1);1570}15711572/*1573 * Check that checking out ce->sha1 in subdir ce->name is not1574 * going to overwrite any working files.1575 *1576 * Currently, git does not checkout subprojects during a superproject1577 * checkout, so it is not going to overwrite anything.1578 */1579static intverify_clean_submodule(const char*old_sha1,1580const struct cache_entry *ce,1581enum unpack_trees_error_types error_type,1582struct unpack_trees_options *o)1583{1584if(!submodule_from_ce(ce))1585return0;15861587returncheck_submodule_move_head(ce, old_sha1,1588oid_to_hex(&ce->oid), o);1589}15901591static intverify_clean_subdirectory(const struct cache_entry *ce,1592enum unpack_trees_error_types error_type,1593struct unpack_trees_options *o)1594{1595/*1596 * we are about to extract "ce->name"; we would not want to lose1597 * anything in the existing directory there.1598 */1599int namelen;1600int i;1601struct dir_struct d;1602char*pathbuf;1603int cnt =0;16041605if(S_ISGITLINK(ce->ce_mode)) {1606struct object_id oid;1607int sub_head =resolve_gitlink_ref(ce->name,"HEAD", &oid);1608/*1609 * If we are not going to update the submodule, then1610 * we don't care.1611 */1612if(!sub_head && !oidcmp(&oid, &ce->oid))1613return0;1614returnverify_clean_submodule(sub_head ? NULL :oid_to_hex(&oid),1615 ce, error_type, o);1616}16171618/*1619 * First let's make sure we do not have a local modification1620 * in that directory.1621 */1622 namelen =ce_namelen(ce);1623for(i =locate_in_src_index(ce, o);1624 i < o->src_index->cache_nr;1625 i++) {1626struct cache_entry *ce2 = o->src_index->cache[i];1627int len =ce_namelen(ce2);1628if(len < namelen ||1629strncmp(ce->name, ce2->name, namelen) ||1630 ce2->name[namelen] !='/')1631break;1632/*1633 * ce2->name is an entry in the subdirectory to be1634 * removed.1635 */1636if(!ce_stage(ce2)) {1637if(verify_uptodate(ce2, o))1638return-1;1639add_entry(o, ce2, CE_REMOVE,0);1640mark_ce_used(ce2, o);1641}1642 cnt++;1643}16441645/*1646 * Then we need to make sure that we do not lose a locally1647 * present file that is not ignored.1648 */1649 pathbuf =xstrfmt("%.*s/", namelen, ce->name);16501651memset(&d,0,sizeof(d));1652if(o->dir)1653 d.exclude_per_dir = o->dir->exclude_per_dir;1654 i =read_directory(&d, &the_index, pathbuf, namelen+1, NULL);1655if(i)1656return o->gently ? -1:1657add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);1658free(pathbuf);1659return cnt;1660}16611662/*1663 * This gets called when there was no index entry for the tree entry 'dst',1664 * but we found a file in the working tree that 'lstat()' said was fine,1665 * and we're on a case-insensitive filesystem.1666 *1667 * See if we can find a case-insensitive match in the index that also1668 * matches the stat information, and assume it's that other file!1669 */1670static inticase_exists(struct unpack_trees_options *o,const char*name,int len,struct stat *st)1671{1672const struct cache_entry *src;16731674 src =index_file_exists(o->src_index, name, len,1);1675return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);1676}16771678static intcheck_ok_to_remove(const char*name,int len,int dtype,1679const struct cache_entry *ce,struct stat *st,1680enum unpack_trees_error_types error_type,1681struct unpack_trees_options *o)1682{1683const struct cache_entry *result;16841685/*1686 * It may be that the 'lstat()' succeeded even though1687 * target 'ce' was absent, because there is an old1688 * entry that is different only in case..1689 *1690 * Ignore that lstat() if it matches.1691 */1692if(ignore_case &&icase_exists(o, name, len, st))1693return0;16941695if(o->dir &&1696is_excluded(o->dir, &the_index, name, &dtype))1697/*1698 * ce->name is explicitly excluded, so it is Ok to1699 * overwrite it.1700 */1701return0;1702if(S_ISDIR(st->st_mode)) {1703/*1704 * We are checking out path "foo" and1705 * found "foo/." in the working tree.1706 * This is tricky -- if we have modified1707 * files that are in "foo/" we would lose1708 * them.1709 */1710if(verify_clean_subdirectory(ce, error_type, o) <0)1711return-1;1712return0;1713}17141715/*1716 * The previous round may already have decided to1717 * delete this path, which is in a subdirectory that1718 * is being replaced with a blob.1719 */1720 result =index_file_exists(&o->result, name, len,0);1721if(result) {1722if(result->ce_flags & CE_REMOVE)1723return0;1724}17251726return o->gently ? -1:1727add_rejected_path(o, error_type, name);1728}17291730/*1731 * We do not want to remove or overwrite a working tree file that1732 * is not tracked, unless it is ignored.1733 */1734static intverify_absent_1(const struct cache_entry *ce,1735enum unpack_trees_error_types error_type,1736struct unpack_trees_options *o)1737{1738int len;1739struct stat st;17401741if(o->index_only || o->reset || !o->update)1742return0;17431744 len =check_leading_path(ce->name,ce_namelen(ce));1745if(!len)1746return0;1747else if(len >0) {1748char*path;1749int ret;17501751 path =xmemdupz(ce->name, len);1752if(lstat(path, &st))1753 ret =error_errno("cannot stat '%s'", path);1754else{1755if(submodule_from_ce(ce))1756 ret =check_submodule_move_head(ce,1757oid_to_hex(&ce->oid),1758 NULL, o);1759else1760 ret =check_ok_to_remove(path, len, DT_UNKNOWN, NULL,1761&st, error_type, o);1762}1763free(path);1764return ret;1765}else if(lstat(ce->name, &st)) {1766if(errno != ENOENT)1767returnerror_errno("cannot stat '%s'", ce->name);1768return0;1769}else{1770if(submodule_from_ce(ce))1771returncheck_submodule_move_head(ce,oid_to_hex(&ce->oid),1772 NULL, o);17731774returncheck_ok_to_remove(ce->name,ce_namelen(ce),1775ce_to_dtype(ce), ce, &st,1776 error_type, o);1777}1778}17791780static intverify_absent(const struct cache_entry *ce,1781enum unpack_trees_error_types error_type,1782struct unpack_trees_options *o)1783{1784if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1785return0;1786returnverify_absent_1(ce, error_type, o);1787}17881789static intverify_absent_sparse(const struct cache_entry *ce,1790enum unpack_trees_error_types error_type,1791struct unpack_trees_options *o)1792{1793enum unpack_trees_error_types orphaned_error = error_type;1794if(orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)1795 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;17961797returnverify_absent_1(ce, orphaned_error, o);1798}17991800static intmerged_entry(const struct cache_entry *ce,1801const struct cache_entry *old,1802struct unpack_trees_options *o)1803{1804int update = CE_UPDATE;1805struct cache_entry *merge =dup_entry(ce, &o->result);18061807if(!old) {1808/*1809 * New index entries. In sparse checkout, the following1810 * verify_absent() will be delayed until after1811 * traverse_trees() finishes in unpack_trees(), then:1812 *1813 * - CE_NEW_SKIP_WORKTREE will be computed correctly1814 * - verify_absent() be called again, this time with1815 * correct CE_NEW_SKIP_WORKTREE1816 *1817 * verify_absent() call here does nothing in sparse1818 * checkout (i.e. o->skip_sparse_checkout == 0)1819 */1820 update |= CE_ADDED;1821 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;18221823if(verify_absent(merge,1824 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1825discard_cache_entry(merge);1826return-1;1827}1828invalidate_ce_path(merge, o);18291830if(submodule_from_ce(ce)) {1831int ret =check_submodule_move_head(ce, NULL,1832oid_to_hex(&ce->oid),1833 o);1834if(ret)1835return ret;1836}18371838}else if(!(old->ce_flags & CE_CONFLICTED)) {1839/*1840 * See if we can re-use the old CE directly?1841 * That way we get the uptodate stat info.1842 *1843 * This also removes the UPDATE flag on a match; otherwise1844 * we will end up overwriting local changes in the work tree.1845 */1846if(same(old, merge)) {1847copy_cache_entry(merge, old);1848 update =0;1849}else{1850if(verify_uptodate(old, o)) {1851discard_cache_entry(merge);1852return-1;1853}1854/* Migrate old flags over */1855 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);1856invalidate_ce_path(old, o);1857}18581859if(submodule_from_ce(ce)) {1860int ret =check_submodule_move_head(ce,oid_to_hex(&old->oid),1861oid_to_hex(&ce->oid),1862 o);1863if(ret)1864return ret;1865}1866}else{1867/*1868 * Previously unmerged entry left as an existence1869 * marker by read_index_unmerged();1870 */1871invalidate_ce_path(old, o);1872}18731874do_add_entry(o, merge, update, CE_STAGEMASK);1875return1;1876}18771878static intdeleted_entry(const struct cache_entry *ce,1879const struct cache_entry *old,1880struct unpack_trees_options *o)1881{1882/* Did it exist in the index? */1883if(!old) {1884if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))1885return-1;1886return0;1887}1888if(!(old->ce_flags & CE_CONFLICTED) &&verify_uptodate(old, o))1889return-1;1890add_entry(o, ce, CE_REMOVE,0);1891invalidate_ce_path(ce, o);1892return1;1893}18941895static intkeep_entry(const struct cache_entry *ce,1896struct unpack_trees_options *o)1897{1898add_entry(o, ce,0,0);1899return1;1900}19011902#if DBRT_DEBUG1903static voidshow_stage_entry(FILE*o,1904const char*label,const struct cache_entry *ce)1905{1906if(!ce)1907fprintf(o,"%s(missing)\n", label);1908else1909fprintf(o,"%s%06o%s %d\t%s\n",1910 label,1911 ce->ce_mode,1912oid_to_hex(&ce->oid),1913ce_stage(ce),1914 ce->name);1915}1916#endif19171918intthreeway_merge(const struct cache_entry *const*stages,1919struct unpack_trees_options *o)1920{1921const struct cache_entry *index;1922const struct cache_entry *head;1923const struct cache_entry *remote = stages[o->head_idx +1];1924int count;1925int head_match =0;1926int remote_match =0;19271928int df_conflict_head =0;1929int df_conflict_remote =0;19301931int any_anc_missing =0;1932int no_anc_exists =1;1933int i;19341935for(i =1; i < o->head_idx; i++) {1936if(!stages[i] || stages[i] == o->df_conflict_entry)1937 any_anc_missing =1;1938else1939 no_anc_exists =0;1940}19411942 index = stages[0];1943 head = stages[o->head_idx];19441945if(head == o->df_conflict_entry) {1946 df_conflict_head =1;1947 head = NULL;1948}19491950if(remote == o->df_conflict_entry) {1951 df_conflict_remote =1;1952 remote = NULL;1953}19541955/*1956 * First, if there's a #16 situation, note that to prevent #131957 * and #14.1958 */1959if(!same(remote, head)) {1960for(i =1; i < o->head_idx; i++) {1961if(same(stages[i], head)) {1962 head_match = i;1963}1964if(same(stages[i], remote)) {1965 remote_match = i;1966}1967}1968}19691970/*1971 * We start with cases where the index is allowed to match1972 * something other than the head: #14(ALT) and #2ALT, where it1973 * is permitted to match the result instead.1974 */1975/* #14, #14ALT, #2ALT */1976if(remote && !df_conflict_head && head_match && !remote_match) {1977if(index && !same(index, remote) && !same(index, head))1978returnreject_merge(index, o);1979returnmerged_entry(remote, index, o);1980}1981/*1982 * If we have an entry in the index cache, then we want to1983 * make sure that it matches head.1984 */1985if(index && !same(index, head))1986returnreject_merge(index, o);19871988if(head) {1989/* #5ALT, #15 */1990if(same(head, remote))1991returnmerged_entry(head, index, o);1992/* #13, #3ALT */1993if(!df_conflict_remote && remote_match && !head_match)1994returnmerged_entry(head, index, o);1995}19961997/* #1 */1998if(!head && !remote && any_anc_missing)1999return0;20002001/*2002 * Under the "aggressive" rule, we resolve mostly trivial2003 * cases that we historically had git-merge-one-file resolve.2004 */2005if(o->aggressive) {2006int head_deleted = !head;2007int remote_deleted = !remote;2008const struct cache_entry *ce = NULL;20092010if(index)2011 ce = index;2012else if(head)2013 ce = head;2014else if(remote)2015 ce = remote;2016else{2017for(i =1; i < o->head_idx; i++) {2018if(stages[i] && stages[i] != o->df_conflict_entry) {2019 ce = stages[i];2020break;2021}2022}2023}20242025/*2026 * Deleted in both.2027 * Deleted in one and unchanged in the other.2028 */2029if((head_deleted && remote_deleted) ||2030(head_deleted && remote && remote_match) ||2031(remote_deleted && head && head_match)) {2032if(index)2033returndeleted_entry(index, index, o);2034if(ce && !head_deleted) {2035if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))2036return-1;2037}2038return0;2039}2040/*2041 * Added in both, identically.2042 */2043if(no_anc_exists && head && remote &&same(head, remote))2044returnmerged_entry(head, index, o);20452046}20472048/* Below are "no merge" cases, which require that the index be2049 * up-to-date to avoid the files getting overwritten with2050 * conflict resolution files.2051 */2052if(index) {2053if(verify_uptodate(index, o))2054return-1;2055}20562057 o->nontrivial_merge =1;20582059/* #2, #3, #4, #6, #7, #9, #10, #11. */2060 count =0;2061if(!head_match || !remote_match) {2062for(i =1; i < o->head_idx; i++) {2063if(stages[i] && stages[i] != o->df_conflict_entry) {2064keep_entry(stages[i], o);2065 count++;2066break;2067}2068}2069}2070#if DBRT_DEBUG2071else{2072fprintf(stderr,"read-tree: warning #16 detected\n");2073show_stage_entry(stderr,"head ", stages[head_match]);2074show_stage_entry(stderr,"remote ", stages[remote_match]);2075}2076#endif2077if(head) { count +=keep_entry(head, o); }2078if(remote) { count +=keep_entry(remote, o); }2079return count;2080}20812082/*2083 * Two-way merge.2084 *2085 * The rule is to "carry forward" what is in the index without losing2086 * information across a "fast-forward", favoring a successful merge2087 * over a merge failure when it makes sense. For details of the2088 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.2089 *2090 */2091inttwoway_merge(const struct cache_entry *const*src,2092struct unpack_trees_options *o)2093{2094const struct cache_entry *current = src[0];2095const struct cache_entry *oldtree = src[1];2096const struct cache_entry *newtree = src[2];20972098if(o->merge_size !=2)2099returnerror("Cannot do a twoway merge of%dtrees",2100 o->merge_size);21012102if(oldtree == o->df_conflict_entry)2103 oldtree = NULL;2104if(newtree == o->df_conflict_entry)2105 newtree = NULL;21062107if(current) {2108if(current->ce_flags & CE_CONFLICTED) {2109if(same(oldtree, newtree) || o->reset) {2110if(!newtree)2111returndeleted_entry(current, current, o);2112else2113returnmerged_entry(newtree, current, o);2114}2115returnreject_merge(current, o);2116}else if((!oldtree && !newtree) ||/* 4 and 5 */2117(!oldtree && newtree &&2118same(current, newtree)) ||/* 6 and 7 */2119(oldtree && newtree &&2120same(oldtree, newtree)) ||/* 14 and 15 */2121(oldtree && newtree &&2122!same(oldtree, newtree) &&/* 18 and 19 */2123same(current, newtree))) {2124returnkeep_entry(current, o);2125}else if(oldtree && !newtree &&same(current, oldtree)) {2126/* 10 or 11 */2127returndeleted_entry(oldtree, current, o);2128}else if(oldtree && newtree &&2129same(current, oldtree) && !same(current, newtree)) {2130/* 20 or 21 */2131returnmerged_entry(newtree, current, o);2132}else2133returnreject_merge(current, o);2134}2135else if(newtree) {2136if(oldtree && !o->initial_checkout) {2137/*2138 * deletion of the path was staged;2139 */2140if(same(oldtree, newtree))2141return1;2142returnreject_merge(oldtree, o);2143}2144returnmerged_entry(newtree, current, o);2145}2146returndeleted_entry(oldtree, current, o);2147}21482149/*2150 * Bind merge.2151 *2152 * Keep the index entries at stage0, collapse stage1 but make sure2153 * stage0 does not have anything there.2154 */2155intbind_merge(const struct cache_entry *const*src,2156struct unpack_trees_options *o)2157{2158const struct cache_entry *old = src[0];2159const struct cache_entry *a = src[1];21602161if(o->merge_size !=1)2162returnerror("Cannot do a bind merge of%dtrees",2163 o->merge_size);2164if(a && old)2165return o->gently ? -1:2166error(ERRORMSG(o, ERROR_BIND_OVERLAP),2167super_prefixed(a->name),2168super_prefixed(old->name));2169if(!a)2170returnkeep_entry(old, o);2171else2172returnmerged_entry(a, NULL, o);2173}21742175/*2176 * One-way merge.2177 *2178 * The rule is:2179 * - take the stat information from stage0, take the data from stage12180 */2181intoneway_merge(const struct cache_entry *const*src,2182struct unpack_trees_options *o)2183{2184const struct cache_entry *old = src[0];2185const struct cache_entry *a = src[1];21862187if(o->merge_size !=1)2188returnerror("Cannot do a oneway merge of%dtrees",2189 o->merge_size);21902191if(!a || a == o->df_conflict_entry)2192returndeleted_entry(old, old, o);21932194if(old &&same(old, a)) {2195int update =0;2196if(o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {2197struct stat st;2198if(lstat(old->name, &st) ||2199ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))2200 update |= CE_UPDATE;2201}2202if(o->update &&S_ISGITLINK(old->ce_mode) &&2203should_update_submodules() && !verify_uptodate(old, o))2204 update |= CE_UPDATE;2205add_entry(o, old, update,0);2206return0;2207}2208returnmerged_entry(a, old, o);2209}