1#define NO_THE_INDEX_COMPATIBILITY_MACROS 2#include"cache.h" 3#include"dir.h" 4#include"tree.h" 5#include"tree-walk.h" 6#include"cache-tree.h" 7#include"unpack-trees.h" 8#include"progress.h" 9#include"refs.h" 10#include"attr.h" 11#include"split-index.h" 12#include"dir.h" 13#include"submodule.h" 14#include"submodule-config.h" 15 16/* 17 * Error messages expected by scripts out of plumbing commands such as 18 * read-tree. Non-scripted Porcelain is not required to use these messages 19 * and in fact are encouraged to reword them to better suit their particular 20 * situation better. See how "git checkout" and "git merge" replaces 21 * them using setup_unpack_trees_porcelain(), for example. 22 */ 23static const char*unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { 24/* ERROR_WOULD_OVERWRITE */ 25"Entry '%s' would be overwritten by merge. Cannot merge.", 26 27/* ERROR_NOT_UPTODATE_FILE */ 28"Entry '%s' not uptodate. Cannot merge.", 29 30/* ERROR_NOT_UPTODATE_DIR */ 31"Updating '%s' would lose untracked files in it", 32 33/* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */ 34"Untracked working tree file '%s' would be overwritten by merge.", 35 36/* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */ 37"Untracked working tree file '%s' would be removed by merge.", 38 39/* ERROR_BIND_OVERLAP */ 40"Entry '%s' overlaps with '%s'. Cannot bind.", 41 42/* ERROR_SPARSE_NOT_UPTODATE_FILE */ 43"Entry '%s' not uptodate. Cannot update sparse checkout.", 44 45/* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ 46"Working tree file '%s' would be overwritten by sparse checkout update.", 47 48/* ERROR_WOULD_LOSE_ORPHANED_REMOVED */ 49"Working tree file '%s' would be removed by sparse checkout update.", 50 51/* ERROR_WOULD_LOSE_SUBMODULE */ 52"Submodule '%s' cannot checkout new HEAD.", 53}; 54 55#define ERRORMSG(o,type) \ 56 ( ((o) && (o)->msgs[(type)]) \ 57 ? ((o)->msgs[(type)]) \ 58 : (unpack_plumbing_errors[(type)]) ) 59 60static const char*super_prefixed(const char*path) 61{ 62/* 63 * It is necessary and sufficient to have two static buffers 64 * here, as the return value of this function is fed to 65 * error() using the unpack_*_errors[] templates we see above. 66 */ 67static struct strbuf buf[2] = {STRBUF_INIT, STRBUF_INIT}; 68static int super_prefix_len = -1; 69static unsigned idx =ARRAY_SIZE(buf) -1; 70 71if(super_prefix_len <0) { 72const char*super_prefix =get_super_prefix(); 73if(!super_prefix) { 74 super_prefix_len =0; 75}else{ 76int i; 77for(i =0; i <ARRAY_SIZE(buf); i++) 78strbuf_addstr(&buf[i], super_prefix); 79 super_prefix_len = buf[0].len; 80} 81} 82 83if(!super_prefix_len) 84return path; 85 86if(++idx >=ARRAY_SIZE(buf)) 87 idx =0; 88 89strbuf_setlen(&buf[idx], super_prefix_len); 90strbuf_addstr(&buf[idx], path); 91 92return buf[idx].buf; 93} 94 95voidsetup_unpack_trees_porcelain(struct unpack_trees_options *opts, 96const char*cmd) 97{ 98int i; 99const char**msgs = opts->msgs; 100const char*msg; 101 102if(!strcmp(cmd,"checkout")) 103 msg = advice_commit_before_merge 104?_("Your local changes to the following files would be overwritten by checkout:\n%%s" 105"Please commit your changes or stash them before you switch branches.") 106:_("Your local changes to the following files would be overwritten by checkout:\n%%s"); 107else if(!strcmp(cmd,"merge")) 108 msg = advice_commit_before_merge 109?_("Your local changes to the following files would be overwritten by merge:\n%%s" 110"Please commit your changes or stash them before you merge.") 111:_("Your local changes to the following files would be overwritten by merge:\n%%s"); 112else 113 msg = advice_commit_before_merge 114?_("Your local changes to the following files would be overwritten by%s:\n%%s" 115"Please commit your changes or stash them before you%s.") 116:_("Your local changes to the following files would be overwritten by%s:\n%%s"); 117 msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = 118xstrfmt(msg, cmd, cmd); 119 120 msgs[ERROR_NOT_UPTODATE_DIR] = 121_("Updating the following directories would lose untracked files in them:\n%s"); 122 123if(!strcmp(cmd,"checkout")) 124 msg = advice_commit_before_merge 125?_("The following untracked working tree files would be removed by checkout:\n%%s" 126"Please move or remove them before you switch branches.") 127:_("The following untracked working tree files would be removed by checkout:\n%%s"); 128else if(!strcmp(cmd,"merge")) 129 msg = advice_commit_before_merge 130?_("The following untracked working tree files would be removed by merge:\n%%s" 131"Please move or remove them before you merge.") 132:_("The following untracked working tree files would be removed by merge:\n%%s"); 133else 134 msg = advice_commit_before_merge 135?_("The following untracked working tree files would be removed by%s:\n%%s" 136"Please move or remove them before you%s.") 137:_("The following untracked working tree files would be removed by%s:\n%%s"); 138 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] =xstrfmt(msg, cmd, cmd); 139 140if(!strcmp(cmd,"checkout")) 141 msg = advice_commit_before_merge 142?_("The following untracked working tree files would be overwritten by checkout:\n%%s" 143"Please move or remove them before you switch branches.") 144:_("The following untracked working tree files would be overwritten by checkout:\n%%s"); 145else if(!strcmp(cmd,"merge")) 146 msg = advice_commit_before_merge 147?_("The following untracked working tree files would be overwritten by merge:\n%%s" 148"Please move or remove them before you merge.") 149:_("The following untracked working tree files would be overwritten by merge:\n%%s"); 150else 151 msg = advice_commit_before_merge 152?_("The following untracked working tree files would be overwritten by%s:\n%%s" 153"Please move or remove them before you%s.") 154:_("The following untracked working tree files would be overwritten by%s:\n%%s"); 155 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] =xstrfmt(msg, cmd, cmd); 156 157/* 158 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we 159 * cannot easily display it as a list. 160 */ 161 msgs[ERROR_BIND_OVERLAP] =_("Entry '%s' overlaps with '%s'. Cannot bind."); 162 163 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = 164_("Cannot update sparse checkout: the following entries are not up-to-date:\n%s"); 165 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = 166_("The following working tree files would be overwritten by sparse checkout update:\n%s"); 167 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = 168_("The following working tree files would be removed by sparse checkout update:\n%s"); 169 msgs[ERROR_WOULD_LOSE_SUBMODULE] = 170_("Cannot update submodule:\n%s"); 171 172 opts->show_all_errors =1; 173/* rejected paths may not have a static buffer */ 174for(i =0; i <ARRAY_SIZE(opts->unpack_rejects); i++) 175 opts->unpack_rejects[i].strdup_strings =1; 176} 177 178static intdo_add_entry(struct unpack_trees_options *o,struct cache_entry *ce, 179unsigned int set,unsigned int clear) 180{ 181 clear |= CE_HASHED; 182 183if(set & CE_REMOVE) 184 set |= CE_WT_REMOVE; 185 186 ce->ce_flags = (ce->ce_flags & ~clear) | set; 187returnadd_index_entry(&o->result, ce, 188 ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); 189} 190 191static struct cache_entry *dup_entry(const struct cache_entry *ce) 192{ 193unsigned int size =ce_size(ce); 194struct cache_entry *new=xmalloc(size); 195 196memcpy(new, ce, size); 197return new; 198} 199 200static voidadd_entry(struct unpack_trees_options *o, 201const struct cache_entry *ce, 202unsigned int set,unsigned int clear) 203{ 204do_add_entry(o,dup_entry(ce), set, clear); 205} 206 207/* 208 * add error messages on path <path> 209 * corresponding to the type <e> with the message <msg> 210 * indicating if it should be display in porcelain or not 211 */ 212static intadd_rejected_path(struct unpack_trees_options *o, 213enum unpack_trees_error_types e, 214const char*path) 215{ 216if(!o->show_all_errors) 217returnerror(ERRORMSG(o, e),super_prefixed(path)); 218 219/* 220 * Otherwise, insert in a list for future display by 221 * display_error_msgs() 222 */ 223string_list_append(&o->unpack_rejects[e], path); 224return-1; 225} 226 227/* 228 * display all the error messages stored in a nice way 229 */ 230static voiddisplay_error_msgs(struct unpack_trees_options *o) 231{ 232int e, i; 233int something_displayed =0; 234for(e =0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { 235struct string_list *rejects = &o->unpack_rejects[e]; 236if(rejects->nr >0) { 237struct strbuf path = STRBUF_INIT; 238 something_displayed =1; 239for(i =0; i < rejects->nr; i++) 240strbuf_addf(&path,"\t%s\n", rejects->items[i].string); 241error(ERRORMSG(o, e),super_prefixed(path.buf)); 242strbuf_release(&path); 243} 244string_list_clear(rejects,0); 245} 246if(something_displayed) 247fprintf(stderr,_("Aborting\n")); 248} 249 250static intcheck_submodule_move_head(const struct cache_entry *ce, 251const char*old_id, 252const char*new_id, 253struct unpack_trees_options *o) 254{ 255unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN; 256const struct submodule *sub =submodule_from_ce(ce); 257if(!sub) 258return0; 259 260if(o->reset) 261 flags |= SUBMODULE_MOVE_HEAD_FORCE; 262 263switch(sub->update_strategy.type) { 264case SM_UPDATE_UNSPECIFIED: 265case SM_UPDATE_CHECKOUT: 266if(submodule_move_head(ce->name, old_id, new_id, flags)) 267return o->gently ? -1: 268add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name); 269return0; 270case SM_UPDATE_NONE: 271return0; 272case SM_UPDATE_REBASE: 273case SM_UPDATE_MERGE: 274case SM_UPDATE_COMMAND: 275default: 276warning(_("submodule update strategy not supported for submodule '%s'"), ce->name); 277return-1; 278} 279} 280 281static voidreload_gitmodules_file(struct index_state *index, 282struct checkout *state) 283{ 284int i; 285for(i =0; i < index->cache_nr; i++) { 286struct cache_entry *ce = index->cache[i]; 287if(ce->ce_flags & CE_UPDATE) { 288int r =strcmp(ce->name,".gitmodules"); 289if(r <0) 290continue; 291else if(r ==0) { 292submodule_free(); 293checkout_entry(ce, state, NULL); 294gitmodules_config(); 295git_config(submodule_config, NULL); 296}else 297break; 298} 299} 300} 301 302/* 303 * Unlink the last component and schedule the leading directories for 304 * removal, such that empty directories get removed. 305 */ 306static voidunlink_entry(const struct cache_entry *ce) 307{ 308const struct submodule *sub =submodule_from_ce(ce); 309if(sub) { 310switch(sub->update_strategy.type) { 311case SM_UPDATE_UNSPECIFIED: 312case SM_UPDATE_CHECKOUT: 313case SM_UPDATE_REBASE: 314case SM_UPDATE_MERGE: 315/* state.force is set at the caller. */ 316submodule_move_head(ce->name,"HEAD", NULL, 317 SUBMODULE_MOVE_HEAD_FORCE); 318break; 319case SM_UPDATE_NONE: 320case SM_UPDATE_COMMAND: 321return;/* Do not touch the submodule. */ 322} 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_progress_delay(_("Checking out files"), 346 total,50,1); 347} 348 349static intcheck_updates(struct unpack_trees_options *o) 350{ 351unsigned cnt =0; 352int errs =0; 353struct progress *progress = NULL; 354struct index_state *index = &o->result; 355struct checkout state = CHECKOUT_INIT; 356int i; 357 358 state.force =1; 359 state.quiet =1; 360 state.refresh_cache =1; 361 state.istate = index; 362 363 progress =get_progress(o); 364 365if(o->update) 366git_attr_set_direction(GIT_ATTR_CHECKOUT, index); 367for(i =0; i < index->cache_nr; i++) { 368const struct cache_entry *ce = index->cache[i]; 369 370if(ce->ce_flags & CE_WT_REMOVE) { 371display_progress(progress, ++cnt); 372if(o->update && !o->dry_run) 373unlink_entry(ce); 374} 375} 376remove_marked_cache_entries(index); 377remove_scheduled_dirs(); 378 379if(should_update_submodules() && o->update && !o->dry_run) 380reload_gitmodules_file(index, &state); 381 382for(i =0; i < index->cache_nr; i++) { 383struct cache_entry *ce = index->cache[i]; 384 385if(ce->ce_flags & CE_UPDATE) { 386if(ce->ce_flags & CE_WT_REMOVE) 387die("BUG: both update and delete flags are set on%s", 388 ce->name); 389display_progress(progress, ++cnt); 390 ce->ce_flags &= ~CE_UPDATE; 391if(o->update && !o->dry_run) { 392 errs |=checkout_entry(ce, &state, NULL); 393} 394} 395} 396stop_progress(&progress); 397if(o->update) 398git_attr_set_direction(GIT_ATTR_CHECKIN, NULL); 399return errs !=0; 400} 401 402static intverify_uptodate_sparse(const struct cache_entry *ce, 403struct unpack_trees_options *o); 404static intverify_absent_sparse(const struct cache_entry *ce, 405enum unpack_trees_error_types, 406struct unpack_trees_options *o); 407 408static intapply_sparse_checkout(struct index_state *istate, 409struct cache_entry *ce, 410struct unpack_trees_options *o) 411{ 412int was_skip_worktree =ce_skip_worktree(ce); 413 414if(ce->ce_flags & CE_NEW_SKIP_WORKTREE) 415 ce->ce_flags |= CE_SKIP_WORKTREE; 416else 417 ce->ce_flags &= ~CE_SKIP_WORKTREE; 418if(was_skip_worktree !=ce_skip_worktree(ce)) { 419 ce->ce_flags |= CE_UPDATE_IN_BASE; 420 istate->cache_changed |= CE_ENTRY_CHANGED; 421} 422 423/* 424 * if (!was_skip_worktree && !ce_skip_worktree()) { 425 * This is perfectly normal. Move on; 426 * } 427 */ 428 429/* 430 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout 431 * area as a result of ce_skip_worktree() shortcuts in 432 * verify_absent() and verify_uptodate(). 433 * Make sure they don't modify worktree if they are already 434 * outside checkout area 435 */ 436if(was_skip_worktree &&ce_skip_worktree(ce)) { 437 ce->ce_flags &= ~CE_UPDATE; 438 439/* 440 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also 441 * on to get that file removed from both index and worktree. 442 * If that file is already outside worktree area, don't 443 * bother remove it. 444 */ 445if(ce->ce_flags & CE_REMOVE) 446 ce->ce_flags &= ~CE_WT_REMOVE; 447} 448 449if(!was_skip_worktree &&ce_skip_worktree(ce)) { 450/* 451 * If CE_UPDATE is set, verify_uptodate() must be called already 452 * also stat info may have lost after merged_entry() so calling 453 * verify_uptodate() again may fail 454 */ 455if(!(ce->ce_flags & CE_UPDATE) &&verify_uptodate_sparse(ce, o)) 456return-1; 457 ce->ce_flags |= CE_WT_REMOVE; 458 ce->ce_flags &= ~CE_UPDATE; 459} 460if(was_skip_worktree && !ce_skip_worktree(ce)) { 461if(verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) 462return-1; 463 ce->ce_flags |= CE_UPDATE; 464} 465return0; 466} 467 468staticinlineintcall_unpack_fn(const struct cache_entry *const*src, 469struct unpack_trees_options *o) 470{ 471int ret = o->fn(src, o); 472if(ret >0) 473 ret =0; 474return ret; 475} 476 477static voidmark_ce_used(struct cache_entry *ce,struct unpack_trees_options *o) 478{ 479 ce->ce_flags |= CE_UNPACKED; 480 481if(o->cache_bottom < o->src_index->cache_nr && 482 o->src_index->cache[o->cache_bottom] == ce) { 483int bottom = o->cache_bottom; 484while(bottom < o->src_index->cache_nr && 485 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) 486 bottom++; 487 o->cache_bottom = bottom; 488} 489} 490 491static voidmark_all_ce_unused(struct index_state *index) 492{ 493int i; 494for(i =0; i < index->cache_nr; i++) 495 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE); 496} 497 498static intlocate_in_src_index(const struct cache_entry *ce, 499struct unpack_trees_options *o) 500{ 501struct index_state *index = o->src_index; 502int len =ce_namelen(ce); 503int pos =index_name_pos(index, ce->name, len); 504if(pos <0) 505 pos = -1- pos; 506return pos; 507} 508 509/* 510 * We call unpack_index_entry() with an unmerged cache entry 511 * only in diff-index, and it wants a single callback. Skip 512 * the other unmerged entry with the same name. 513 */ 514static voidmark_ce_used_same_name(struct cache_entry *ce, 515struct unpack_trees_options *o) 516{ 517struct index_state *index = o->src_index; 518int len =ce_namelen(ce); 519int pos; 520 521for(pos =locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { 522struct cache_entry *next = index->cache[pos]; 523if(len !=ce_namelen(next) || 524memcmp(ce->name, next->name, len)) 525break; 526mark_ce_used(next, o); 527} 528} 529 530static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) 531{ 532const struct index_state *index = o->src_index; 533int pos = o->cache_bottom; 534 535while(pos < index->cache_nr) { 536struct cache_entry *ce = index->cache[pos]; 537if(!(ce->ce_flags & CE_UNPACKED)) 538return ce; 539 pos++; 540} 541return NULL; 542} 543 544static voidadd_same_unmerged(const struct cache_entry *ce, 545struct unpack_trees_options *o) 546{ 547struct index_state *index = o->src_index; 548int len =ce_namelen(ce); 549int pos =index_name_pos(index, ce->name, len); 550 551if(0<= pos) 552die("programming error in a caller of mark_ce_used_same_name"); 553for(pos = -pos -1; pos < index->cache_nr; pos++) { 554struct cache_entry *next = index->cache[pos]; 555if(len !=ce_namelen(next) || 556memcmp(ce->name, next->name, len)) 557break; 558add_entry(o, next,0,0); 559mark_ce_used(next, o); 560} 561} 562 563static intunpack_index_entry(struct cache_entry *ce, 564struct unpack_trees_options *o) 565{ 566const struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, }; 567int ret; 568 569 src[0] = ce; 570 571mark_ce_used(ce, o); 572if(ce_stage(ce)) { 573if(o->skip_unmerged) { 574add_entry(o, ce,0,0); 575return0; 576} 577} 578 ret =call_unpack_fn(src, o); 579if(ce_stage(ce)) 580mark_ce_used_same_name(ce, o); 581return ret; 582} 583 584static intfind_cache_pos(struct traverse_info *,const struct name_entry *); 585 586static voidrestore_cache_bottom(struct traverse_info *info,int bottom) 587{ 588struct unpack_trees_options *o = info->data; 589 590if(o->diff_index_cached) 591return; 592 o->cache_bottom = bottom; 593} 594 595static intswitch_cache_bottom(struct traverse_info *info) 596{ 597struct unpack_trees_options *o = info->data; 598int ret, pos; 599 600if(o->diff_index_cached) 601return0; 602 ret = o->cache_bottom; 603 pos =find_cache_pos(info->prev, &info->name); 604 605if(pos < -1) 606 o->cache_bottom = -2- pos; 607else if(pos <0) 608 o->cache_bottom = o->src_index->cache_nr; 609return ret; 610} 611 612staticinlineintare_same_oid(struct name_entry *name_j,struct name_entry *name_k) 613{ 614return name_j->oid && name_k->oid && !oidcmp(name_j->oid, name_k->oid); 615} 616 617static inttraverse_trees_recursive(int n,unsigned long dirmask, 618unsigned long df_conflicts, 619struct name_entry *names, 620struct traverse_info *info) 621{ 622int i, ret, bottom; 623int nr_buf =0; 624struct tree_desc t[MAX_UNPACK_TREES]; 625void*buf[MAX_UNPACK_TREES]; 626struct traverse_info newinfo; 627struct name_entry *p; 628 629 p = names; 630while(!p->mode) 631 p++; 632 633 newinfo = *info; 634 newinfo.prev = info; 635 newinfo.pathspec = info->pathspec; 636 newinfo.name = *p; 637 newinfo.pathlen +=tree_entry_len(p) +1; 638 newinfo.df_conflicts |= df_conflicts; 639 640/* 641 * Fetch the tree from the ODB for each peer directory in the 642 * n commits. 643 * 644 * For 2- and 3-way traversals, we try to avoid hitting the 645 * ODB twice for the same OID. This should yield a nice speed 646 * up in checkouts and merges when the commits are similar. 647 * 648 * We don't bother doing the full O(n^2) search for larger n, 649 * because wider traversals don't happen that often and we 650 * avoid the search setup. 651 * 652 * When 2 peer OIDs are the same, we just copy the tree 653 * descriptor data. This implicitly borrows the buffer 654 * data from the earlier cell. 655 */ 656for(i =0; i < n; i++, dirmask >>=1) { 657if(i >0&&are_same_oid(&names[i], &names[i -1])) 658 t[i] = t[i -1]; 659else if(i >1&&are_same_oid(&names[i], &names[i -2])) 660 t[i] = t[i -2]; 661else{ 662const unsigned char*sha1 = NULL; 663if(dirmask &1) 664 sha1 = names[i].oid->hash; 665 buf[nr_buf++] =fill_tree_descriptor(t+i, sha1); 666} 667} 668 669 bottom =switch_cache_bottom(&newinfo); 670 ret =traverse_trees(n, t, &newinfo); 671restore_cache_bottom(&newinfo, bottom); 672 673for(i =0; i < nr_buf; i++) 674free(buf[i]); 675 676return ret; 677} 678 679/* 680 * Compare the traverse-path to the cache entry without actually 681 * having to generate the textual representation of the traverse 682 * path. 683 * 684 * NOTE! This *only* compares up to the size of the traverse path 685 * itself - the caller needs to do the final check for the cache 686 * entry having more data at the end! 687 */ 688static intdo_compare_entry_piecewise(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 689{ 690int len, pathlen, ce_len; 691const char*ce_name; 692 693if(info->prev) { 694int cmp =do_compare_entry_piecewise(ce, info->prev, 695&info->name); 696if(cmp) 697return cmp; 698} 699 pathlen = info->pathlen; 700 ce_len =ce_namelen(ce); 701 702/* If ce_len < pathlen then we must have previously hit "name == directory" entry */ 703if(ce_len < pathlen) 704return-1; 705 706 ce_len -= pathlen; 707 ce_name = ce->name + pathlen; 708 709 len =tree_entry_len(n); 710returndf_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 711} 712 713static intdo_compare_entry(const struct cache_entry *ce, 714const struct traverse_info *info, 715const struct name_entry *n) 716{ 717int len, pathlen, ce_len; 718const char*ce_name; 719int cmp; 720 721/* 722 * If we have not precomputed the traverse path, it is quicker 723 * to avoid doing so. But if we have precomputed it, 724 * it is quicker to use the precomputed version. 725 */ 726if(!info->traverse_path) 727returndo_compare_entry_piecewise(ce, info, n); 728 729 cmp =strncmp(ce->name, info->traverse_path, info->pathlen); 730if(cmp) 731return cmp; 732 733 pathlen = info->pathlen; 734 ce_len =ce_namelen(ce); 735 736if(ce_len < pathlen) 737return-1; 738 739 ce_len -= pathlen; 740 ce_name = ce->name + pathlen; 741 742 len =tree_entry_len(n); 743returndf_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 744} 745 746static intcompare_entry(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 747{ 748int cmp =do_compare_entry(ce, info, n); 749if(cmp) 750return cmp; 751 752/* 753 * Even if the beginning compared identically, the ce should 754 * compare as bigger than a directory leading up to it! 755 */ 756returnce_namelen(ce) >traverse_path_len(info, n); 757} 758 759static intce_in_traverse_path(const struct cache_entry *ce, 760const struct traverse_info *info) 761{ 762if(!info->prev) 763return1; 764if(do_compare_entry(ce, info->prev, &info->name)) 765return0; 766/* 767 * If ce (blob) is the same name as the path (which is a tree 768 * we will be descending into), it won't be inside it. 769 */ 770return(info->pathlen <ce_namelen(ce)); 771} 772 773static struct cache_entry *create_ce_entry(const struct traverse_info *info,const struct name_entry *n,int stage) 774{ 775int len =traverse_path_len(info, n); 776struct cache_entry *ce =xcalloc(1,cache_entry_size(len)); 777 778 ce->ce_mode =create_ce_mode(n->mode); 779 ce->ce_flags =create_ce_flags(stage); 780 ce->ce_namelen = len; 781oidcpy(&ce->oid, n->oid); 782make_traverse_path(ce->name, info, n); 783 784return ce; 785} 786 787static intunpack_nondirectories(int n,unsigned long mask, 788unsigned long dirmask, 789struct cache_entry **src, 790const struct name_entry *names, 791const struct traverse_info *info) 792{ 793int i; 794struct unpack_trees_options *o = info->data; 795unsigned long conflicts = info->df_conflicts | dirmask; 796 797/* Do we have *only* directories? Nothing to do */ 798if(mask == dirmask && !src[0]) 799return0; 800 801/* 802 * Ok, we've filled in up to any potential index entry in src[0], 803 * now do the rest. 804 */ 805for(i =0; i < n; i++) { 806int stage; 807unsigned int bit =1ul<< i; 808if(conflicts & bit) { 809 src[i + o->merge] = o->df_conflict_entry; 810continue; 811} 812if(!(mask & bit)) 813continue; 814if(!o->merge) 815 stage =0; 816else if(i +1< o->head_idx) 817 stage =1; 818else if(i +1> o->head_idx) 819 stage =3; 820else 821 stage =2; 822 src[i + o->merge] =create_ce_entry(info, names + i, stage); 823} 824 825if(o->merge) { 826int rc =call_unpack_fn((const struct cache_entry *const*)src, 827 o); 828for(i =0; i < n; i++) { 829struct cache_entry *ce = src[i + o->merge]; 830if(ce != o->df_conflict_entry) 831free(ce); 832} 833return rc; 834} 835 836for(i =0; i < n; i++) 837if(src[i] && src[i] != o->df_conflict_entry) 838if(do_add_entry(o, src[i],0,0)) 839return-1; 840 841return0; 842} 843 844static intunpack_failed(struct unpack_trees_options *o,const char*message) 845{ 846discard_index(&o->result); 847if(!o->gently && !o->exiting_early) { 848if(message) 849returnerror("%s", message); 850return-1; 851} 852return-1; 853} 854 855/* 856 * The tree traversal is looking at name p. If we have a matching entry, 857 * return it. If name p is a directory in the index, do not return 858 * anything, as we will want to match it when the traversal descends into 859 * the directory. 860 */ 861static intfind_cache_pos(struct traverse_info *info, 862const struct name_entry *p) 863{ 864int pos; 865struct unpack_trees_options *o = info->data; 866struct index_state *index = o->src_index; 867int pfxlen = info->pathlen; 868int p_len =tree_entry_len(p); 869 870for(pos = o->cache_bottom; pos < index->cache_nr; pos++) { 871const struct cache_entry *ce = index->cache[pos]; 872const char*ce_name, *ce_slash; 873int cmp, ce_len; 874 875if(ce->ce_flags & CE_UNPACKED) { 876/* 877 * cache_bottom entry is already unpacked, so 878 * we can never match it; don't check it 879 * again. 880 */ 881if(pos == o->cache_bottom) 882++o->cache_bottom; 883continue; 884} 885if(!ce_in_traverse_path(ce, info)) { 886/* 887 * Check if we can skip future cache checks 888 * (because we're already past all possible 889 * entries in the traverse path). 890 */ 891if(info->traverse_path) { 892if(strncmp(ce->name, info->traverse_path, 893 info->pathlen) >0) 894break; 895} 896continue; 897} 898 ce_name = ce->name + pfxlen; 899 ce_slash =strchr(ce_name,'/'); 900if(ce_slash) 901 ce_len = ce_slash - ce_name; 902else 903 ce_len =ce_namelen(ce) - pfxlen; 904 cmp =name_compare(p->path, p_len, ce_name, ce_len); 905/* 906 * Exact match; if we have a directory we need to 907 * delay returning it. 908 */ 909if(!cmp) 910return ce_slash ? -2- pos : pos; 911if(0< cmp) 912continue;/* keep looking */ 913/* 914 * ce_name sorts after p->path; could it be that we 915 * have files under p->path directory in the index? 916 * E.g. ce_name == "t-i", and p->path == "t"; we may 917 * have "t/a" in the index. 918 */ 919if(p_len < ce_len && !memcmp(ce_name, p->path, p_len) && 920 ce_name[p_len] <'/') 921continue;/* keep looking */ 922break; 923} 924return-1; 925} 926 927static struct cache_entry *find_cache_entry(struct traverse_info *info, 928const struct name_entry *p) 929{ 930int pos =find_cache_pos(info, p); 931struct unpack_trees_options *o = info->data; 932 933if(0<= pos) 934return o->src_index->cache[pos]; 935else 936return NULL; 937} 938 939static voiddebug_path(struct traverse_info *info) 940{ 941if(info->prev) { 942debug_path(info->prev); 943if(*info->prev->name.path) 944putchar('/'); 945} 946printf("%s", info->name.path); 947} 948 949static voiddebug_name_entry(int i,struct name_entry *n) 950{ 951printf("ent#%d %06o%s\n", i, 952 n->path ? n->mode :0, 953 n->path ? n->path :"(missing)"); 954} 955 956static voiddebug_unpack_callback(int n, 957unsigned long mask, 958unsigned long dirmask, 959struct name_entry *names, 960struct traverse_info *info) 961{ 962int i; 963printf("* unpack mask%lu, dirmask%lu, cnt%d", 964 mask, dirmask, n); 965debug_path(info); 966putchar('\n'); 967for(i =0; i < n; i++) 968debug_name_entry(i, names + i); 969} 970 971static intunpack_callback(int n,unsigned long mask,unsigned long dirmask,struct name_entry *names,struct traverse_info *info) 972{ 973struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, }; 974struct unpack_trees_options *o = info->data; 975const struct name_entry *p = names; 976 977/* Find first entry with a real name (we could use "mask" too) */ 978while(!p->mode) 979 p++; 980 981if(o->debug_unpack) 982debug_unpack_callback(n, mask, dirmask, names, info); 983 984/* Are we supposed to look at the index too? */ 985if(o->merge) { 986while(1) { 987int cmp; 988struct cache_entry *ce; 989 990if(o->diff_index_cached) 991 ce =next_cache_entry(o); 992else 993 ce =find_cache_entry(info, p); 994 995if(!ce) 996break; 997 cmp =compare_entry(ce, info, p); 998if(cmp <0) { 999if(unpack_index_entry(ce, o) <0)1000returnunpack_failed(o, NULL);1001continue;1002}1003if(!cmp) {1004if(ce_stage(ce)) {1005/*1006 * If we skip unmerged index1007 * entries, we'll skip this1008 * entry *and* the tree1009 * entries associated with it!1010 */1011if(o->skip_unmerged) {1012add_same_unmerged(ce, o);1013return mask;1014}1015}1016 src[0] = ce;1017}1018break;1019}1020}10211022if(unpack_nondirectories(n, mask, dirmask, src, names, info) <0)1023return-1;10241025if(o->merge && src[0]) {1026if(ce_stage(src[0]))1027mark_ce_used_same_name(src[0], o);1028else1029mark_ce_used(src[0], o);1030}10311032/* Now handle any directories.. */1033if(dirmask) {1034/* special case: "diff-index --cached" looking at a tree */1035if(o->diff_index_cached &&1036 n ==1&& dirmask ==1&&S_ISDIR(names->mode)) {1037int matches;1038 matches =cache_tree_matches_traversal(o->src_index->cache_tree,1039 names, info);1040/*1041 * Everything under the name matches; skip the1042 * entire hierarchy. diff_index_cached codepath1043 * special cases D/F conflicts in such a way that1044 * it does not do any look-ahead, so this is safe.1045 */1046if(matches) {1047 o->cache_bottom += matches;1048return mask;1049}1050}10511052if(traverse_trees_recursive(n, dirmask, mask & ~dirmask,1053 names, info) <0)1054return-1;1055return mask;1056}10571058return mask;1059}10601061static intclear_ce_flags_1(struct cache_entry **cache,int nr,1062struct strbuf *prefix,1063int select_mask,int clear_mask,1064struct exclude_list *el,int defval);10651066/* Whole directory matching */1067static intclear_ce_flags_dir(struct cache_entry **cache,int nr,1068struct strbuf *prefix,1069char*basename,1070int select_mask,int clear_mask,1071struct exclude_list *el,int defval)1072{1073struct cache_entry **cache_end;1074int dtype = DT_DIR;1075int ret =is_excluded_from_list(prefix->buf, prefix->len,1076 basename, &dtype, el, &the_index);1077int rc;10781079strbuf_addch(prefix,'/');10801081/* If undecided, use matching result of parent dir in defval */1082if(ret <0)1083 ret = defval;10841085for(cache_end = cache; cache_end != cache + nr; cache_end++) {1086struct cache_entry *ce = *cache_end;1087if(strncmp(ce->name, prefix->buf, prefix->len))1088break;1089}10901091/*1092 * TODO: check el, if there are no patterns that may conflict1093 * with ret (iow, we know in advance the incl/excl1094 * decision for the entire directory), clear flag here without1095 * calling clear_ce_flags_1(). That function will call1096 * the expensive is_excluded_from_list() on every entry.1097 */1098 rc =clear_ce_flags_1(cache, cache_end - cache,1099 prefix,1100 select_mask, clear_mask,1101 el, ret);1102strbuf_setlen(prefix, prefix->len -1);1103return rc;1104}11051106/*1107 * Traverse the index, find every entry that matches according to1108 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the1109 * number of traversed entries.1110 *1111 * If select_mask is non-zero, only entries whose ce_flags has on of1112 * those bits enabled are traversed.1113 *1114 * cache : pointer to an index entry1115 * prefix_len : an offset to its path1116 *1117 * The current path ("prefix") including the trailing '/' is1118 * cache[0]->name[0..(prefix_len-1)]1119 * Top level path has prefix_len zero.1120 */1121static intclear_ce_flags_1(struct cache_entry **cache,int nr,1122struct strbuf *prefix,1123int select_mask,int clear_mask,1124struct exclude_list *el,int defval)1125{1126struct cache_entry **cache_end = cache + nr;11271128/*1129 * Process all entries that have the given prefix and meet1130 * select_mask condition1131 */1132while(cache != cache_end) {1133struct cache_entry *ce = *cache;1134const char*name, *slash;1135int len, dtype, ret;11361137if(select_mask && !(ce->ce_flags & select_mask)) {1138 cache++;1139continue;1140}11411142if(prefix->len &&strncmp(ce->name, prefix->buf, prefix->len))1143break;11441145 name = ce->name + prefix->len;1146 slash =strchr(name,'/');11471148/* If it's a directory, try whole directory match first */1149if(slash) {1150int processed;11511152 len = slash - name;1153strbuf_add(prefix, name, len);11541155 processed =clear_ce_flags_dir(cache, cache_end - cache,1156 prefix,1157 prefix->buf + prefix->len - len,1158 select_mask, clear_mask,1159 el, defval);11601161/* clear_c_f_dir eats a whole dir already? */1162if(processed) {1163 cache += processed;1164strbuf_setlen(prefix, prefix->len - len);1165continue;1166}11671168strbuf_addch(prefix,'/');1169 cache +=clear_ce_flags_1(cache, cache_end - cache,1170 prefix,1171 select_mask, clear_mask, el, defval);1172strbuf_setlen(prefix, prefix->len - len -1);1173continue;1174}11751176/* Non-directory */1177 dtype =ce_to_dtype(ce);1178 ret =is_excluded_from_list(ce->name,ce_namelen(ce),1179 name, &dtype, el, &the_index);1180if(ret <0)1181 ret = defval;1182if(ret >0)1183 ce->ce_flags &= ~clear_mask;1184 cache++;1185}1186return nr - (cache_end - cache);1187}11881189static intclear_ce_flags(struct cache_entry **cache,int nr,1190int select_mask,int clear_mask,1191struct exclude_list *el)1192{1193static struct strbuf prefix = STRBUF_INIT;11941195strbuf_reset(&prefix);11961197returnclear_ce_flags_1(cache, nr,1198&prefix,1199 select_mask, clear_mask,1200 el,0);1201}12021203/*1204 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout1205 */1206static voidmark_new_skip_worktree(struct exclude_list *el,1207struct index_state *the_index,1208int select_flag,int skip_wt_flag)1209{1210int i;12111212/*1213 * 1. Pretend the narrowest worktree: only unmerged entries1214 * are checked out1215 */1216for(i =0; i < the_index->cache_nr; i++) {1217struct cache_entry *ce = the_index->cache[i];12181219if(select_flag && !(ce->ce_flags & select_flag))1220continue;12211222if(!ce_stage(ce))1223 ce->ce_flags |= skip_wt_flag;1224else1225 ce->ce_flags &= ~skip_wt_flag;1226}12271228/*1229 * 2. Widen worktree according to sparse-checkout file.1230 * Matched entries will have skip_wt_flag cleared (i.e. "in")1231 */1232clear_ce_flags(the_index->cache, the_index->cache_nr,1233 select_flag, skip_wt_flag, el);1234}12351236static intverify_absent(const struct cache_entry *,1237enum unpack_trees_error_types,1238struct unpack_trees_options *);1239/*1240 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the1241 * resulting index, -2 on failure to reflect the changes to the work tree.1242 *1243 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally1244 */1245intunpack_trees(unsigned len,struct tree_desc *t,struct unpack_trees_options *o)1246{1247int i, ret;1248static struct cache_entry *dfc;1249struct exclude_list el;12501251if(len > MAX_UNPACK_TREES)1252die("unpack_trees takes at most%dtrees", MAX_UNPACK_TREES);12531254memset(&el,0,sizeof(el));1255if(!core_apply_sparse_checkout || !o->update)1256 o->skip_sparse_checkout =1;1257if(!o->skip_sparse_checkout) {1258char*sparse =git_pathdup("info/sparse-checkout");1259if(add_excludes_from_file_to_list(sparse,"",0, &el, NULL) <0)1260 o->skip_sparse_checkout =1;1261else1262 o->el = ⪙1263free(sparse);1264}12651266memset(&o->result,0,sizeof(o->result));1267 o->result.initialized =1;1268 o->result.timestamp.sec = o->src_index->timestamp.sec;1269 o->result.timestamp.nsec = o->src_index->timestamp.nsec;1270 o->result.version = o->src_index->version;1271 o->result.split_index = o->src_index->split_index;1272if(o->result.split_index)1273 o->result.split_index->refcount++;1274hashcpy(o->result.sha1, o->src_index->sha1);1275 o->merge_size = len;1276mark_all_ce_unused(o->src_index);12771278/*1279 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries1280 */1281if(!o->skip_sparse_checkout)1282mark_new_skip_worktree(o->el, o->src_index,0, CE_NEW_SKIP_WORKTREE);12831284if(!dfc)1285 dfc =xcalloc(1,cache_entry_size(0));1286 o->df_conflict_entry = dfc;12871288if(len) {1289const char*prefix = o->prefix ? o->prefix :"";1290struct traverse_info info;12911292setup_traverse_info(&info, prefix);1293 info.fn = unpack_callback;1294 info.data = o;1295 info.show_all_errors = o->show_all_errors;1296 info.pathspec = o->pathspec;12971298if(o->prefix) {1299/*1300 * Unpack existing index entries that sort before the1301 * prefix the tree is spliced into. Note that o->merge1302 * is always true in this case.1303 */1304while(1) {1305struct cache_entry *ce =next_cache_entry(o);1306if(!ce)1307break;1308if(ce_in_traverse_path(ce, &info))1309break;1310if(unpack_index_entry(ce, o) <0)1311goto return_failed;1312}1313}13141315if(traverse_trees(len, t, &info) <0)1316goto return_failed;1317}13181319/* Any left-over entries in the index? */1320if(o->merge) {1321while(1) {1322struct cache_entry *ce =next_cache_entry(o);1323if(!ce)1324break;1325if(unpack_index_entry(ce, o) <0)1326goto return_failed;1327}1328}1329mark_all_ce_unused(o->src_index);13301331if(o->trivial_merges_only && o->nontrivial_merge) {1332 ret =unpack_failed(o,"Merge requires file-level merging");1333goto done;1334}13351336if(!o->skip_sparse_checkout) {1337int empty_worktree =1;13381339/*1340 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #11341 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE1342 * so apply_sparse_checkout() won't attempt to remove it from worktree1343 */1344mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);13451346 ret =0;1347for(i =0; i < o->result.cache_nr; i++) {1348struct cache_entry *ce = o->result.cache[i];13491350/*1351 * Entries marked with CE_ADDED in merged_entry() do not have1352 * verify_absent() check (the check is effectively disabled1353 * because CE_NEW_SKIP_WORKTREE is set unconditionally).1354 *1355 * Do the real check now because we have had1356 * correct CE_NEW_SKIP_WORKTREE1357 */1358if(ce->ce_flags & CE_ADDED &&1359verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1360if(!o->show_all_errors)1361goto return_failed;1362 ret = -1;1363}13641365if(apply_sparse_checkout(&o->result, ce, o)) {1366if(!o->show_all_errors)1367goto return_failed;1368 ret = -1;1369}1370if(!ce_skip_worktree(ce))1371 empty_worktree =0;13721373}1374if(ret <0)1375goto return_failed;1376/*1377 * Sparse checkout is meant to narrow down checkout area1378 * but it does not make sense to narrow down to empty working1379 * tree. This is usually a mistake in sparse checkout rules.1380 * Do not allow users to do that.1381 */1382if(o->result.cache_nr && empty_worktree) {1383 ret =unpack_failed(o,"Sparse checkout leaves no entry on working directory");1384goto done;1385}1386}13871388 o->src_index = NULL;1389 ret =check_updates(o) ? (-2) :0;1390if(o->dst_index) {1391if(!ret) {1392if(!o->result.cache_tree)1393 o->result.cache_tree =cache_tree();1394if(!cache_tree_fully_valid(o->result.cache_tree))1395cache_tree_update(&o->result,1396 WRITE_TREE_SILENT |1397 WRITE_TREE_REPAIR);1398}1399discard_index(o->dst_index);1400*o->dst_index = o->result;1401}else{1402discard_index(&o->result);1403}14041405done:1406clear_exclude_list(&el);1407return ret;14081409return_failed:1410if(o->show_all_errors)1411display_error_msgs(o);1412mark_all_ce_unused(o->src_index);1413 ret =unpack_failed(o, NULL);1414if(o->exiting_early)1415 ret =0;1416goto done;1417}14181419/* Here come the merge functions */14201421static intreject_merge(const struct cache_entry *ce,1422struct unpack_trees_options *o)1423{1424return o->gently ? -1:1425add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);1426}14271428static intsame(const struct cache_entry *a,const struct cache_entry *b)1429{1430if(!!a != !!b)1431return0;1432if(!a && !b)1433return1;1434if((a->ce_flags | b->ce_flags) & CE_CONFLICTED)1435return0;1436return a->ce_mode == b->ce_mode &&1437!oidcmp(&a->oid, &b->oid);1438}143914401441/*1442 * When a CE gets turned into an unmerged entry, we1443 * want it to be up-to-date1444 */1445static intverify_uptodate_1(const struct cache_entry *ce,1446struct unpack_trees_options *o,1447enum unpack_trees_error_types error_type)1448{1449struct stat st;14501451if(o->index_only)1452return0;14531454/*1455 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again1456 * if this entry is truly up-to-date because this file may be1457 * overwritten.1458 */1459if((ce->ce_flags & CE_VALID) ||ce_skip_worktree(ce))1460;/* keep checking */1461else if(o->reset ||ce_uptodate(ce))1462return0;14631464if(!lstat(ce->name, &st)) {1465int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;1466unsigned changed =ie_match_stat(o->src_index, ce, &st, flags);14671468if(submodule_from_ce(ce)) {1469int r =check_submodule_move_head(ce,1470"HEAD",oid_to_hex(&ce->oid), o);1471if(r)1472return o->gently ? -1:1473add_rejected_path(o, error_type, ce->name);1474return0;1475}14761477if(!changed)1478return0;1479/*1480 * Historic default policy was to allow submodule to be out1481 * of sync wrt the superproject index. If the submodule was1482 * not considered interesting above, we don't care here.1483 */1484if(S_ISGITLINK(ce->ce_mode))1485return0;14861487 errno =0;1488}1489if(errno == ENOENT)1490return0;1491return o->gently ? -1:1492add_rejected_path(o, error_type, ce->name);1493}14941495static intverify_uptodate(const struct cache_entry *ce,1496struct unpack_trees_options *o)1497{1498if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1499return0;1500returnverify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);1501}15021503static intverify_uptodate_sparse(const struct cache_entry *ce,1504struct unpack_trees_options *o)1505{1506returnverify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);1507}15081509static voidinvalidate_ce_path(const struct cache_entry *ce,1510struct unpack_trees_options *o)1511{1512if(!ce)1513return;1514cache_tree_invalidate_path(o->src_index, ce->name);1515untracked_cache_invalidate_path(o->src_index, ce->name);1516}15171518/*1519 * Check that checking out ce->sha1 in subdir ce->name is not1520 * going to overwrite any working files.1521 *1522 * Currently, git does not checkout subprojects during a superproject1523 * checkout, so it is not going to overwrite anything.1524 */1525static intverify_clean_submodule(const char*old_sha1,1526const struct cache_entry *ce,1527enum unpack_trees_error_types error_type,1528struct unpack_trees_options *o)1529{1530if(!submodule_from_ce(ce))1531return0;15321533returncheck_submodule_move_head(ce, old_sha1,1534oid_to_hex(&ce->oid), o);1535}15361537static intverify_clean_subdirectory(const struct cache_entry *ce,1538enum unpack_trees_error_types error_type,1539struct unpack_trees_options *o)1540{1541/*1542 * we are about to extract "ce->name"; we would not want to lose1543 * anything in the existing directory there.1544 */1545int namelen;1546int i;1547struct dir_struct d;1548char*pathbuf;1549int cnt =0;15501551if(S_ISGITLINK(ce->ce_mode)) {1552unsigned char sha1[20];1553int sub_head =resolve_gitlink_ref(ce->name,"HEAD", sha1);1554/*1555 * If we are not going to update the submodule, then1556 * we don't care.1557 */1558if(!sub_head && !hashcmp(sha1, ce->oid.hash))1559return0;1560returnverify_clean_submodule(sub_head ? NULL :sha1_to_hex(sha1),1561 ce, error_type, o);1562}15631564/*1565 * First let's make sure we do not have a local modification1566 * in that directory.1567 */1568 namelen =ce_namelen(ce);1569for(i =locate_in_src_index(ce, o);1570 i < o->src_index->cache_nr;1571 i++) {1572struct cache_entry *ce2 = o->src_index->cache[i];1573int len =ce_namelen(ce2);1574if(len < namelen ||1575strncmp(ce->name, ce2->name, namelen) ||1576 ce2->name[namelen] !='/')1577break;1578/*1579 * ce2->name is an entry in the subdirectory to be1580 * removed.1581 */1582if(!ce_stage(ce2)) {1583if(verify_uptodate(ce2, o))1584return-1;1585add_entry(o, ce2, CE_REMOVE,0);1586mark_ce_used(ce2, o);1587}1588 cnt++;1589}15901591/*1592 * Then we need to make sure that we do not lose a locally1593 * present file that is not ignored.1594 */1595 pathbuf =xstrfmt("%.*s/", namelen, ce->name);15961597memset(&d,0,sizeof(d));1598if(o->dir)1599 d.exclude_per_dir = o->dir->exclude_per_dir;1600 i =read_directory(&d, &the_index, pathbuf, namelen+1, NULL);1601if(i)1602return o->gently ? -1:1603add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);1604free(pathbuf);1605return cnt;1606}16071608/*1609 * This gets called when there was no index entry for the tree entry 'dst',1610 * but we found a file in the working tree that 'lstat()' said was fine,1611 * and we're on a case-insensitive filesystem.1612 *1613 * See if we can find a case-insensitive match in the index that also1614 * matches the stat information, and assume it's that other file!1615 */1616static inticase_exists(struct unpack_trees_options *o,const char*name,int len,struct stat *st)1617{1618const struct cache_entry *src;16191620 src =index_file_exists(o->src_index, name, len,1);1621return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);1622}16231624static intcheck_ok_to_remove(const char*name,int len,int dtype,1625const struct cache_entry *ce,struct stat *st,1626enum unpack_trees_error_types error_type,1627struct unpack_trees_options *o)1628{1629const struct cache_entry *result;16301631/*1632 * It may be that the 'lstat()' succeeded even though1633 * target 'ce' was absent, because there is an old1634 * entry that is different only in case..1635 *1636 * Ignore that lstat() if it matches.1637 */1638if(ignore_case &&icase_exists(o, name, len, st))1639return0;16401641if(o->dir &&1642is_excluded(o->dir, &the_index, name, &dtype))1643/*1644 * ce->name is explicitly excluded, so it is Ok to1645 * overwrite it.1646 */1647return0;1648if(S_ISDIR(st->st_mode)) {1649/*1650 * We are checking out path "foo" and1651 * found "foo/." in the working tree.1652 * This is tricky -- if we have modified1653 * files that are in "foo/" we would lose1654 * them.1655 */1656if(verify_clean_subdirectory(ce, error_type, o) <0)1657return-1;1658return0;1659}16601661/*1662 * The previous round may already have decided to1663 * delete this path, which is in a subdirectory that1664 * is being replaced with a blob.1665 */1666 result =index_file_exists(&o->result, name, len,0);1667if(result) {1668if(result->ce_flags & CE_REMOVE)1669return0;1670}16711672return o->gently ? -1:1673add_rejected_path(o, error_type, name);1674}16751676/*1677 * We do not want to remove or overwrite a working tree file that1678 * is not tracked, unless it is ignored.1679 */1680static intverify_absent_1(const struct cache_entry *ce,1681enum unpack_trees_error_types error_type,1682struct unpack_trees_options *o)1683{1684int len;1685struct stat st;16861687if(o->index_only || o->reset || !o->update)1688return0;16891690 len =check_leading_path(ce->name,ce_namelen(ce));1691if(!len)1692return0;1693else if(len >0) {1694char*path;1695int ret;16961697 path =xmemdupz(ce->name, len);1698if(lstat(path, &st))1699 ret =error_errno("cannot stat '%s'", path);1700else{1701if(submodule_from_ce(ce))1702 ret =check_submodule_move_head(ce,1703oid_to_hex(&ce->oid),1704 NULL, o);1705else1706 ret =check_ok_to_remove(path, len, DT_UNKNOWN, NULL,1707&st, error_type, o);1708}1709free(path);1710return ret;1711}else if(lstat(ce->name, &st)) {1712if(errno != ENOENT)1713returnerror_errno("cannot stat '%s'", ce->name);1714return0;1715}else{1716if(submodule_from_ce(ce))1717returncheck_submodule_move_head(ce,oid_to_hex(&ce->oid),1718 NULL, o);17191720returncheck_ok_to_remove(ce->name,ce_namelen(ce),1721ce_to_dtype(ce), ce, &st,1722 error_type, o);1723}1724}17251726static intverify_absent(const struct cache_entry *ce,1727enum unpack_trees_error_types error_type,1728struct unpack_trees_options *o)1729{1730if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1731return0;1732returnverify_absent_1(ce, error_type, o);1733}17341735static intverify_absent_sparse(const struct cache_entry *ce,1736enum unpack_trees_error_types error_type,1737struct unpack_trees_options *o)1738{1739enum unpack_trees_error_types orphaned_error = error_type;1740if(orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)1741 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;17421743returnverify_absent_1(ce, orphaned_error, o);1744}17451746static intmerged_entry(const struct cache_entry *ce,1747const struct cache_entry *old,1748struct unpack_trees_options *o)1749{1750int update = CE_UPDATE;1751struct cache_entry *merge =dup_entry(ce);17521753if(!old) {1754/*1755 * New index entries. In sparse checkout, the following1756 * verify_absent() will be delayed until after1757 * traverse_trees() finishes in unpack_trees(), then:1758 *1759 * - CE_NEW_SKIP_WORKTREE will be computed correctly1760 * - verify_absent() be called again, this time with1761 * correct CE_NEW_SKIP_WORKTREE1762 *1763 * verify_absent() call here does nothing in sparse1764 * checkout (i.e. o->skip_sparse_checkout == 0)1765 */1766 update |= CE_ADDED;1767 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;17681769if(verify_absent(merge,1770 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1771free(merge);1772return-1;1773}1774invalidate_ce_path(merge, o);17751776if(submodule_from_ce(ce)) {1777int ret =check_submodule_move_head(ce, NULL,1778oid_to_hex(&ce->oid),1779 o);1780if(ret)1781return ret;1782}17831784}else if(!(old->ce_flags & CE_CONFLICTED)) {1785/*1786 * See if we can re-use the old CE directly?1787 * That way we get the uptodate stat info.1788 *1789 * This also removes the UPDATE flag on a match; otherwise1790 * we will end up overwriting local changes in the work tree.1791 */1792if(same(old, merge)) {1793copy_cache_entry(merge, old);1794 update =0;1795}else{1796if(verify_uptodate(old, o)) {1797free(merge);1798return-1;1799}1800/* Migrate old flags over */1801 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);1802invalidate_ce_path(old, o);1803}18041805if(submodule_from_ce(ce)) {1806int ret =check_submodule_move_head(ce,oid_to_hex(&old->oid),1807oid_to_hex(&ce->oid),1808 o);1809if(ret)1810return ret;1811}1812}else{1813/*1814 * Previously unmerged entry left as an existence1815 * marker by read_index_unmerged();1816 */1817invalidate_ce_path(old, o);1818}18191820do_add_entry(o, merge, update, CE_STAGEMASK);1821return1;1822}18231824static intdeleted_entry(const struct cache_entry *ce,1825const struct cache_entry *old,1826struct unpack_trees_options *o)1827{1828/* Did it exist in the index? */1829if(!old) {1830if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))1831return-1;1832return0;1833}1834if(!(old->ce_flags & CE_CONFLICTED) &&verify_uptodate(old, o))1835return-1;1836add_entry(o, ce, CE_REMOVE,0);1837invalidate_ce_path(ce, o);1838return1;1839}18401841static intkeep_entry(const struct cache_entry *ce,1842struct unpack_trees_options *o)1843{1844add_entry(o, ce,0,0);1845return1;1846}18471848#if DBRT_DEBUG1849static voidshow_stage_entry(FILE*o,1850const char*label,const struct cache_entry *ce)1851{1852if(!ce)1853fprintf(o,"%s(missing)\n", label);1854else1855fprintf(o,"%s%06o%s %d\t%s\n",1856 label,1857 ce->ce_mode,1858oid_to_hex(&ce->oid),1859ce_stage(ce),1860 ce->name);1861}1862#endif18631864intthreeway_merge(const struct cache_entry *const*stages,1865struct unpack_trees_options *o)1866{1867const struct cache_entry *index;1868const struct cache_entry *head;1869const struct cache_entry *remote = stages[o->head_idx +1];1870int count;1871int head_match =0;1872int remote_match =0;18731874int df_conflict_head =0;1875int df_conflict_remote =0;18761877int any_anc_missing =0;1878int no_anc_exists =1;1879int i;18801881for(i =1; i < o->head_idx; i++) {1882if(!stages[i] || stages[i] == o->df_conflict_entry)1883 any_anc_missing =1;1884else1885 no_anc_exists =0;1886}18871888 index = stages[0];1889 head = stages[o->head_idx];18901891if(head == o->df_conflict_entry) {1892 df_conflict_head =1;1893 head = NULL;1894}18951896if(remote == o->df_conflict_entry) {1897 df_conflict_remote =1;1898 remote = NULL;1899}19001901/*1902 * First, if there's a #16 situation, note that to prevent #131903 * and #14.1904 */1905if(!same(remote, head)) {1906for(i =1; i < o->head_idx; i++) {1907if(same(stages[i], head)) {1908 head_match = i;1909}1910if(same(stages[i], remote)) {1911 remote_match = i;1912}1913}1914}19151916/*1917 * We start with cases where the index is allowed to match1918 * something other than the head: #14(ALT) and #2ALT, where it1919 * is permitted to match the result instead.1920 */1921/* #14, #14ALT, #2ALT */1922if(remote && !df_conflict_head && head_match && !remote_match) {1923if(index && !same(index, remote) && !same(index, head))1924returnreject_merge(index, o);1925returnmerged_entry(remote, index, o);1926}1927/*1928 * If we have an entry in the index cache, then we want to1929 * make sure that it matches head.1930 */1931if(index && !same(index, head))1932returnreject_merge(index, o);19331934if(head) {1935/* #5ALT, #15 */1936if(same(head, remote))1937returnmerged_entry(head, index, o);1938/* #13, #3ALT */1939if(!df_conflict_remote && remote_match && !head_match)1940returnmerged_entry(head, index, o);1941}19421943/* #1 */1944if(!head && !remote && any_anc_missing)1945return0;19461947/*1948 * Under the "aggressive" rule, we resolve mostly trivial1949 * cases that we historically had git-merge-one-file resolve.1950 */1951if(o->aggressive) {1952int head_deleted = !head;1953int remote_deleted = !remote;1954const struct cache_entry *ce = NULL;19551956if(index)1957 ce = index;1958else if(head)1959 ce = head;1960else if(remote)1961 ce = remote;1962else{1963for(i =1; i < o->head_idx; i++) {1964if(stages[i] && stages[i] != o->df_conflict_entry) {1965 ce = stages[i];1966break;1967}1968}1969}19701971/*1972 * Deleted in both.1973 * Deleted in one and unchanged in the other.1974 */1975if((head_deleted && remote_deleted) ||1976(head_deleted && remote && remote_match) ||1977(remote_deleted && head && head_match)) {1978if(index)1979returndeleted_entry(index, index, o);1980if(ce && !head_deleted) {1981if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))1982return-1;1983}1984return0;1985}1986/*1987 * Added in both, identically.1988 */1989if(no_anc_exists && head && remote &&same(head, remote))1990returnmerged_entry(head, index, o);19911992}19931994/* Below are "no merge" cases, which require that the index be1995 * up-to-date to avoid the files getting overwritten with1996 * conflict resolution files.1997 */1998if(index) {1999if(verify_uptodate(index, o))2000return-1;2001}20022003 o->nontrivial_merge =1;20042005/* #2, #3, #4, #6, #7, #9, #10, #11. */2006 count =0;2007if(!head_match || !remote_match) {2008for(i =1; i < o->head_idx; i++) {2009if(stages[i] && stages[i] != o->df_conflict_entry) {2010keep_entry(stages[i], o);2011 count++;2012break;2013}2014}2015}2016#if DBRT_DEBUG2017else{2018fprintf(stderr,"read-tree: warning #16 detected\n");2019show_stage_entry(stderr,"head ", stages[head_match]);2020show_stage_entry(stderr,"remote ", stages[remote_match]);2021}2022#endif2023if(head) { count +=keep_entry(head, o); }2024if(remote) { count +=keep_entry(remote, o); }2025return count;2026}20272028/*2029 * Two-way merge.2030 *2031 * The rule is to "carry forward" what is in the index without losing2032 * information across a "fast-forward", favoring a successful merge2033 * over a merge failure when it makes sense. For details of the2034 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.2035 *2036 */2037inttwoway_merge(const struct cache_entry *const*src,2038struct unpack_trees_options *o)2039{2040const struct cache_entry *current = src[0];2041const struct cache_entry *oldtree = src[1];2042const struct cache_entry *newtree = src[2];20432044if(o->merge_size !=2)2045returnerror("Cannot do a twoway merge of%dtrees",2046 o->merge_size);20472048if(oldtree == o->df_conflict_entry)2049 oldtree = NULL;2050if(newtree == o->df_conflict_entry)2051 newtree = NULL;20522053if(current) {2054if(current->ce_flags & CE_CONFLICTED) {2055if(same(oldtree, newtree) || o->reset) {2056if(!newtree)2057returndeleted_entry(current, current, o);2058else2059returnmerged_entry(newtree, current, o);2060}2061returnreject_merge(current, o);2062}else if((!oldtree && !newtree) ||/* 4 and 5 */2063(!oldtree && newtree &&2064same(current, newtree)) ||/* 6 and 7 */2065(oldtree && newtree &&2066same(oldtree, newtree)) ||/* 14 and 15 */2067(oldtree && newtree &&2068!same(oldtree, newtree) &&/* 18 and 19 */2069same(current, newtree))) {2070returnkeep_entry(current, o);2071}else if(oldtree && !newtree &&same(current, oldtree)) {2072/* 10 or 11 */2073returndeleted_entry(oldtree, current, o);2074}else if(oldtree && newtree &&2075same(current, oldtree) && !same(current, newtree)) {2076/* 20 or 21 */2077returnmerged_entry(newtree, current, o);2078}else2079returnreject_merge(current, o);2080}2081else if(newtree) {2082if(oldtree && !o->initial_checkout) {2083/*2084 * deletion of the path was staged;2085 */2086if(same(oldtree, newtree))2087return1;2088returnreject_merge(oldtree, o);2089}2090returnmerged_entry(newtree, current, o);2091}2092returndeleted_entry(oldtree, current, o);2093}20942095/*2096 * Bind merge.2097 *2098 * Keep the index entries at stage0, collapse stage1 but make sure2099 * stage0 does not have anything there.2100 */2101intbind_merge(const struct cache_entry *const*src,2102struct unpack_trees_options *o)2103{2104const struct cache_entry *old = src[0];2105const struct cache_entry *a = src[1];21062107if(o->merge_size !=1)2108returnerror("Cannot do a bind merge of%dtrees",2109 o->merge_size);2110if(a && old)2111return o->gently ? -1:2112error(ERRORMSG(o, ERROR_BIND_OVERLAP),2113super_prefixed(a->name),2114super_prefixed(old->name));2115if(!a)2116returnkeep_entry(old, o);2117else2118returnmerged_entry(a, NULL, o);2119}21202121/*2122 * One-way merge.2123 *2124 * The rule is:2125 * - take the stat information from stage0, take the data from stage12126 */2127intoneway_merge(const struct cache_entry *const*src,2128struct unpack_trees_options *o)2129{2130const struct cache_entry *old = src[0];2131const struct cache_entry *a = src[1];21322133if(o->merge_size !=1)2134returnerror("Cannot do a oneway merge of%dtrees",2135 o->merge_size);21362137if(!a || a == o->df_conflict_entry)2138returndeleted_entry(old, old, o);21392140if(old &&same(old, a)) {2141int update =0;2142if(o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {2143struct stat st;2144if(lstat(old->name, &st) ||2145ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))2146 update |= CE_UPDATE;2147}2148add_entry(o, old, update,0);2149return0;2150}2151returnmerged_entry(a, old, o);2152}