1#define NO_THE_INDEX_COMPATIBILITY_MACROS 2#include"cache.h" 3#include"config.h" 4#include"dir.h" 5#include"tree.h" 6#include"tree-walk.h" 7#include"cache-tree.h" 8#include"unpack-trees.h" 9#include"progress.h" 10#include"refs.h" 11#include"attr.h" 12#include"split-index.h" 13#include"dir.h" 14#include"submodule.h" 15#include"submodule-config.h" 16 17/* 18 * Error messages expected by scripts out of plumbing commands such as 19 * read-tree. Non-scripted Porcelain is not required to use these messages 20 * and in fact are encouraged to reword them to better suit their particular 21 * situation better. See how "git checkout" and "git merge" replaces 22 * them using setup_unpack_trees_porcelain(), for example. 23 */ 24static const char*unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { 25/* ERROR_WOULD_OVERWRITE */ 26"Entry '%s' would be overwritten by merge. Cannot merge.", 27 28/* ERROR_NOT_UPTODATE_FILE */ 29"Entry '%s' not uptodate. Cannot merge.", 30 31/* ERROR_NOT_UPTODATE_DIR */ 32"Updating '%s' would lose untracked files in it", 33 34/* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */ 35"Untracked working tree file '%s' would be overwritten by merge.", 36 37/* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */ 38"Untracked working tree file '%s' would be removed by merge.", 39 40/* ERROR_BIND_OVERLAP */ 41"Entry '%s' overlaps with '%s'. Cannot bind.", 42 43/* ERROR_SPARSE_NOT_UPTODATE_FILE */ 44"Entry '%s' not uptodate. Cannot update sparse checkout.", 45 46/* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ 47"Working tree file '%s' would be overwritten by sparse checkout update.", 48 49/* ERROR_WOULD_LOSE_ORPHANED_REMOVED */ 50"Working tree file '%s' would be removed by sparse checkout update.", 51 52/* ERROR_WOULD_LOSE_SUBMODULE */ 53"Submodule '%s' cannot checkout new HEAD.", 54}; 55 56#define ERRORMSG(o,type) \ 57 ( ((o) && (o)->msgs[(type)]) \ 58 ? ((o)->msgs[(type)]) \ 59 : (unpack_plumbing_errors[(type)]) ) 60 61static const char*super_prefixed(const char*path) 62{ 63/* 64 * It is necessary and sufficient to have two static buffers 65 * here, as the return value of this function is fed to 66 * error() using the unpack_*_errors[] templates we see above. 67 */ 68static struct strbuf buf[2] = {STRBUF_INIT, STRBUF_INIT}; 69static int super_prefix_len = -1; 70static unsigned idx =ARRAY_SIZE(buf) -1; 71 72if(super_prefix_len <0) { 73const char*super_prefix =get_super_prefix(); 74if(!super_prefix) { 75 super_prefix_len =0; 76}else{ 77int i; 78for(i =0; i <ARRAY_SIZE(buf); i++) 79strbuf_addstr(&buf[i], super_prefix); 80 super_prefix_len = buf[0].len; 81} 82} 83 84if(!super_prefix_len) 85return path; 86 87if(++idx >=ARRAY_SIZE(buf)) 88 idx =0; 89 90strbuf_setlen(&buf[idx], super_prefix_len); 91strbuf_addstr(&buf[idx], path); 92 93return buf[idx].buf; 94} 95 96voidsetup_unpack_trees_porcelain(struct unpack_trees_options *opts, 97const char*cmd) 98{ 99int i; 100const char**msgs = opts->msgs; 101const char*msg; 102 103if(!strcmp(cmd,"checkout")) 104 msg = advice_commit_before_merge 105?_("Your local changes to the following files would be overwritten by checkout:\n%%s" 106"Please commit your changes or stash them before you switch branches.") 107:_("Your local changes to the following files would be overwritten by checkout:\n%%s"); 108else if(!strcmp(cmd,"merge")) 109 msg = advice_commit_before_merge 110?_("Your local changes to the following files would be overwritten by merge:\n%%s" 111"Please commit your changes or stash them before you merge.") 112:_("Your local changes to the following files would be overwritten by merge:\n%%s"); 113else 114 msg = advice_commit_before_merge 115?_("Your local changes to the following files would be overwritten by%s:\n%%s" 116"Please commit your changes or stash them before you%s.") 117:_("Your local changes to the following files would be overwritten by%s:\n%%s"); 118 msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = 119xstrfmt(msg, cmd, cmd); 120 121 msgs[ERROR_NOT_UPTODATE_DIR] = 122_("Updating the following directories would lose untracked files in them:\n%s"); 123 124if(!strcmp(cmd,"checkout")) 125 msg = advice_commit_before_merge 126?_("The following untracked working tree files would be removed by checkout:\n%%s" 127"Please move or remove them before you switch branches.") 128:_("The following untracked working tree files would be removed by checkout:\n%%s"); 129else if(!strcmp(cmd,"merge")) 130 msg = advice_commit_before_merge 131?_("The following untracked working tree files would be removed by merge:\n%%s" 132"Please move or remove them before you merge.") 133:_("The following untracked working tree files would be removed by merge:\n%%s"); 134else 135 msg = advice_commit_before_merge 136?_("The following untracked working tree files would be removed by%s:\n%%s" 137"Please move or remove them before you%s.") 138:_("The following untracked working tree files would be removed by%s:\n%%s"); 139 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] =xstrfmt(msg, cmd, cmd); 140 141if(!strcmp(cmd,"checkout")) 142 msg = advice_commit_before_merge 143?_("The following untracked working tree files would be overwritten by checkout:\n%%s" 144"Please move or remove them before you switch branches.") 145:_("The following untracked working tree files would be overwritten by checkout:\n%%s"); 146else if(!strcmp(cmd,"merge")) 147 msg = advice_commit_before_merge 148?_("The following untracked working tree files would be overwritten by merge:\n%%s" 149"Please move or remove them before you merge.") 150:_("The following untracked working tree files would be overwritten by merge:\n%%s"); 151else 152 msg = advice_commit_before_merge 153?_("The following untracked working tree files would be overwritten by%s:\n%%s" 154"Please move or remove them before you%s.") 155:_("The following untracked working tree files would be overwritten by%s:\n%%s"); 156 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] =xstrfmt(msg, cmd, cmd); 157 158/* 159 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we 160 * cannot easily display it as a list. 161 */ 162 msgs[ERROR_BIND_OVERLAP] =_("Entry '%s' overlaps with '%s'. Cannot bind."); 163 164 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = 165_("Cannot update sparse checkout: the following entries are not up-to-date:\n%s"); 166 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = 167_("The following working tree files would be overwritten by sparse checkout update:\n%s"); 168 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = 169_("The following working tree files would be removed by sparse checkout update:\n%s"); 170 msgs[ERROR_WOULD_LOSE_SUBMODULE] = 171_("Cannot update submodule:\n%s"); 172 173 opts->show_all_errors =1; 174/* rejected paths may not have a static buffer */ 175for(i =0; i <ARRAY_SIZE(opts->unpack_rejects); i++) 176 opts->unpack_rejects[i].strdup_strings =1; 177} 178 179static intdo_add_entry(struct unpack_trees_options *o,struct cache_entry *ce, 180unsigned int set,unsigned int clear) 181{ 182 clear |= CE_HASHED; 183 184if(set & CE_REMOVE) 185 set |= CE_WT_REMOVE; 186 187 ce->ce_flags = (ce->ce_flags & ~clear) | set; 188returnadd_index_entry(&o->result, ce, 189 ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); 190} 191 192static struct cache_entry *dup_entry(const struct cache_entry *ce) 193{ 194unsigned int size =ce_size(ce); 195struct cache_entry *new=xmalloc(size); 196 197memcpy(new, ce, size); 198return new; 199} 200 201static voidadd_entry(struct unpack_trees_options *o, 202const struct cache_entry *ce, 203unsigned int set,unsigned int clear) 204{ 205do_add_entry(o,dup_entry(ce), set, clear); 206} 207 208/* 209 * add error messages on path <path> 210 * corresponding to the type <e> with the message <msg> 211 * indicating if it should be display in porcelain or not 212 */ 213static intadd_rejected_path(struct unpack_trees_options *o, 214enum unpack_trees_error_types e, 215const char*path) 216{ 217if(!o->show_all_errors) 218returnerror(ERRORMSG(o, e),super_prefixed(path)); 219 220/* 221 * Otherwise, insert in a list for future display by 222 * display_error_msgs() 223 */ 224string_list_append(&o->unpack_rejects[e], path); 225return-1; 226} 227 228/* 229 * display all the error messages stored in a nice way 230 */ 231static voiddisplay_error_msgs(struct unpack_trees_options *o) 232{ 233int e, i; 234int something_displayed =0; 235for(e =0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { 236struct string_list *rejects = &o->unpack_rejects[e]; 237if(rejects->nr >0) { 238struct strbuf path = STRBUF_INIT; 239 something_displayed =1; 240for(i =0; i < rejects->nr; i++) 241strbuf_addf(&path,"\t%s\n", rejects->items[i].string); 242error(ERRORMSG(o, e),super_prefixed(path.buf)); 243strbuf_release(&path); 244} 245string_list_clear(rejects,0); 246} 247if(something_displayed) 248fprintf(stderr,_("Aborting\n")); 249} 250 251static intcheck_submodule_move_head(const struct cache_entry *ce, 252const char*old_id, 253const char*new_id, 254struct unpack_trees_options *o) 255{ 256const struct submodule *sub =submodule_from_ce(ce); 257if(!sub) 258return0; 259 260switch(sub->update_strategy.type) { 261case SM_UPDATE_UNSPECIFIED: 262case SM_UPDATE_CHECKOUT: 263if(submodule_move_head(ce->name, old_id, new_id, SUBMODULE_MOVE_HEAD_DRY_RUN)) 264return o->gently ? -1: 265add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name); 266return0; 267case SM_UPDATE_NONE: 268return0; 269case SM_UPDATE_REBASE: 270case SM_UPDATE_MERGE: 271case SM_UPDATE_COMMAND: 272default: 273warning(_("submodule update strategy not supported for submodule '%s'"), ce->name); 274return-1; 275} 276} 277 278static voidreload_gitmodules_file(struct index_state *index, 279struct checkout *state) 280{ 281int i; 282for(i =0; i < index->cache_nr; i++) { 283struct cache_entry *ce = index->cache[i]; 284if(ce->ce_flags & CE_UPDATE) { 285int r =strcmp(ce->name,".gitmodules"); 286if(r <0) 287continue; 288else if(r ==0) { 289submodule_free(); 290checkout_entry(ce, state, NULL); 291gitmodules_config(); 292git_config(submodule_config, NULL); 293}else 294break; 295} 296} 297} 298 299/* 300 * Unlink the last component and schedule the leading directories for 301 * removal, such that empty directories get removed. 302 */ 303static voidunlink_entry(const struct cache_entry *ce) 304{ 305const struct submodule *sub =submodule_from_ce(ce); 306if(sub) { 307switch(sub->update_strategy.type) { 308case SM_UPDATE_UNSPECIFIED: 309case SM_UPDATE_CHECKOUT: 310case SM_UPDATE_REBASE: 311case SM_UPDATE_MERGE: 312submodule_move_head(ce->name,"HEAD", NULL, 313 SUBMODULE_MOVE_HEAD_FORCE); 314break; 315case SM_UPDATE_NONE: 316case SM_UPDATE_COMMAND: 317return;/* Do not touch the submodule. */ 318} 319} 320if(!check_leading_path(ce->name,ce_namelen(ce))) 321return; 322if(remove_or_warn(ce->ce_mode, ce->name)) 323return; 324schedule_dir_for_removal(ce->name,ce_namelen(ce)); 325} 326 327static struct progress *get_progress(struct unpack_trees_options *o) 328{ 329unsigned cnt =0, total =0; 330struct index_state *index = &o->result; 331 332if(!o->update || !o->verbose_update) 333return NULL; 334 335for(; cnt < index->cache_nr; cnt++) { 336const struct cache_entry *ce = index->cache[cnt]; 337if(ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE)) 338 total++; 339} 340 341returnstart_progress_delay(_("Checking out files"), 342 total,50,1); 343} 344 345static intcheck_updates(struct unpack_trees_options *o) 346{ 347unsigned cnt =0; 348int errs =0; 349struct progress *progress = NULL; 350struct index_state *index = &o->result; 351struct checkout state = CHECKOUT_INIT; 352int i; 353 354 state.force =1; 355 state.quiet =1; 356 state.refresh_cache =1; 357 state.istate = index; 358 359 progress =get_progress(o); 360 361if(o->update) 362git_attr_set_direction(GIT_ATTR_CHECKOUT, index); 363for(i =0; i < index->cache_nr; i++) { 364const struct cache_entry *ce = index->cache[i]; 365 366if(ce->ce_flags & CE_WT_REMOVE) { 367display_progress(progress, ++cnt); 368if(o->update && !o->dry_run) 369unlink_entry(ce); 370} 371} 372remove_marked_cache_entries(index); 373remove_scheduled_dirs(); 374 375if(should_update_submodules() && o->update && !o->dry_run) 376reload_gitmodules_file(index, &state); 377 378for(i =0; i < index->cache_nr; i++) { 379struct cache_entry *ce = index->cache[i]; 380 381if(ce->ce_flags & CE_UPDATE) { 382if(ce->ce_flags & CE_WT_REMOVE) 383die("BUG: both update and delete flags are set on%s", 384 ce->name); 385display_progress(progress, ++cnt); 386 ce->ce_flags &= ~CE_UPDATE; 387if(o->update && !o->dry_run) { 388 errs |=checkout_entry(ce, &state, NULL); 389} 390} 391} 392stop_progress(&progress); 393if(o->update) 394git_attr_set_direction(GIT_ATTR_CHECKIN, NULL); 395return errs !=0; 396} 397 398static intverify_uptodate_sparse(const struct cache_entry *ce, 399struct unpack_trees_options *o); 400static intverify_absent_sparse(const struct cache_entry *ce, 401enum unpack_trees_error_types, 402struct unpack_trees_options *o); 403 404static intapply_sparse_checkout(struct index_state *istate, 405struct cache_entry *ce, 406struct unpack_trees_options *o) 407{ 408int was_skip_worktree =ce_skip_worktree(ce); 409 410if(ce->ce_flags & CE_NEW_SKIP_WORKTREE) 411 ce->ce_flags |= CE_SKIP_WORKTREE; 412else 413 ce->ce_flags &= ~CE_SKIP_WORKTREE; 414if(was_skip_worktree !=ce_skip_worktree(ce)) { 415 ce->ce_flags |= CE_UPDATE_IN_BASE; 416 istate->cache_changed |= CE_ENTRY_CHANGED; 417} 418 419/* 420 * if (!was_skip_worktree && !ce_skip_worktree()) { 421 * This is perfectly normal. Move on; 422 * } 423 */ 424 425/* 426 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout 427 * area as a result of ce_skip_worktree() shortcuts in 428 * verify_absent() and verify_uptodate(). 429 * Make sure they don't modify worktree if they are already 430 * outside checkout area 431 */ 432if(was_skip_worktree &&ce_skip_worktree(ce)) { 433 ce->ce_flags &= ~CE_UPDATE; 434 435/* 436 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also 437 * on to get that file removed from both index and worktree. 438 * If that file is already outside worktree area, don't 439 * bother remove it. 440 */ 441if(ce->ce_flags & CE_REMOVE) 442 ce->ce_flags &= ~CE_WT_REMOVE; 443} 444 445if(!was_skip_worktree &&ce_skip_worktree(ce)) { 446/* 447 * If CE_UPDATE is set, verify_uptodate() must be called already 448 * also stat info may have lost after merged_entry() so calling 449 * verify_uptodate() again may fail 450 */ 451if(!(ce->ce_flags & CE_UPDATE) &&verify_uptodate_sparse(ce, o)) 452return-1; 453 ce->ce_flags |= CE_WT_REMOVE; 454 ce->ce_flags &= ~CE_UPDATE; 455} 456if(was_skip_worktree && !ce_skip_worktree(ce)) { 457if(verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) 458return-1; 459 ce->ce_flags |= CE_UPDATE; 460} 461return0; 462} 463 464staticinlineintcall_unpack_fn(const struct cache_entry *const*src, 465struct unpack_trees_options *o) 466{ 467int ret = o->fn(src, o); 468if(ret >0) 469 ret =0; 470return ret; 471} 472 473static voidmark_ce_used(struct cache_entry *ce,struct unpack_trees_options *o) 474{ 475 ce->ce_flags |= CE_UNPACKED; 476 477if(o->cache_bottom < o->src_index->cache_nr && 478 o->src_index->cache[o->cache_bottom] == ce) { 479int bottom = o->cache_bottom; 480while(bottom < o->src_index->cache_nr && 481 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) 482 bottom++; 483 o->cache_bottom = bottom; 484} 485} 486 487static voidmark_all_ce_unused(struct index_state *index) 488{ 489int i; 490for(i =0; i < index->cache_nr; i++) 491 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE); 492} 493 494static intlocate_in_src_index(const struct cache_entry *ce, 495struct unpack_trees_options *o) 496{ 497struct index_state *index = o->src_index; 498int len =ce_namelen(ce); 499int pos =index_name_pos(index, ce->name, len); 500if(pos <0) 501 pos = -1- pos; 502return pos; 503} 504 505/* 506 * We call unpack_index_entry() with an unmerged cache entry 507 * only in diff-index, and it wants a single callback. Skip 508 * the other unmerged entry with the same name. 509 */ 510static voidmark_ce_used_same_name(struct cache_entry *ce, 511struct unpack_trees_options *o) 512{ 513struct index_state *index = o->src_index; 514int len =ce_namelen(ce); 515int pos; 516 517for(pos =locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { 518struct cache_entry *next = index->cache[pos]; 519if(len !=ce_namelen(next) || 520memcmp(ce->name, next->name, len)) 521break; 522mark_ce_used(next, o); 523} 524} 525 526static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) 527{ 528const struct index_state *index = o->src_index; 529int pos = o->cache_bottom; 530 531while(pos < index->cache_nr) { 532struct cache_entry *ce = index->cache[pos]; 533if(!(ce->ce_flags & CE_UNPACKED)) 534return ce; 535 pos++; 536} 537return NULL; 538} 539 540static voidadd_same_unmerged(const struct cache_entry *ce, 541struct unpack_trees_options *o) 542{ 543struct index_state *index = o->src_index; 544int len =ce_namelen(ce); 545int pos =index_name_pos(index, ce->name, len); 546 547if(0<= pos) 548die("programming error in a caller of mark_ce_used_same_name"); 549for(pos = -pos -1; pos < index->cache_nr; pos++) { 550struct cache_entry *next = index->cache[pos]; 551if(len !=ce_namelen(next) || 552memcmp(ce->name, next->name, len)) 553break; 554add_entry(o, next,0,0); 555mark_ce_used(next, o); 556} 557} 558 559static intunpack_index_entry(struct cache_entry *ce, 560struct unpack_trees_options *o) 561{ 562const struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, }; 563int ret; 564 565 src[0] = ce; 566 567mark_ce_used(ce, o); 568if(ce_stage(ce)) { 569if(o->skip_unmerged) { 570add_entry(o, ce,0,0); 571return0; 572} 573} 574 ret =call_unpack_fn(src, o); 575if(ce_stage(ce)) 576mark_ce_used_same_name(ce, o); 577return ret; 578} 579 580static intfind_cache_pos(struct traverse_info *,const struct name_entry *); 581 582static voidrestore_cache_bottom(struct traverse_info *info,int bottom) 583{ 584struct unpack_trees_options *o = info->data; 585 586if(o->diff_index_cached) 587return; 588 o->cache_bottom = bottom; 589} 590 591static intswitch_cache_bottom(struct traverse_info *info) 592{ 593struct unpack_trees_options *o = info->data; 594int ret, pos; 595 596if(o->diff_index_cached) 597return0; 598 ret = o->cache_bottom; 599 pos =find_cache_pos(info->prev, &info->name); 600 601if(pos < -1) 602 o->cache_bottom = -2- pos; 603else if(pos <0) 604 o->cache_bottom = o->src_index->cache_nr; 605return ret; 606} 607 608staticinlineintare_same_oid(struct name_entry *name_j,struct name_entry *name_k) 609{ 610return name_j->oid && name_k->oid && !oidcmp(name_j->oid, name_k->oid); 611} 612 613static inttraverse_trees_recursive(int n,unsigned long dirmask, 614unsigned long df_conflicts, 615struct name_entry *names, 616struct traverse_info *info) 617{ 618int i, ret, bottom; 619int nr_buf =0; 620struct tree_desc t[MAX_UNPACK_TREES]; 621void*buf[MAX_UNPACK_TREES]; 622struct traverse_info newinfo; 623struct name_entry *p; 624 625 p = names; 626while(!p->mode) 627 p++; 628 629 newinfo = *info; 630 newinfo.prev = info; 631 newinfo.pathspec = info->pathspec; 632 newinfo.name = *p; 633 newinfo.pathlen +=tree_entry_len(p) +1; 634 newinfo.df_conflicts |= df_conflicts; 635 636/* 637 * Fetch the tree from the ODB for each peer directory in the 638 * n commits. 639 * 640 * For 2- and 3-way traversals, we try to avoid hitting the 641 * ODB twice for the same OID. This should yield a nice speed 642 * up in checkouts and merges when the commits are similar. 643 * 644 * We don't bother doing the full O(n^2) search for larger n, 645 * because wider traversals don't happen that often and we 646 * avoid the search setup. 647 * 648 * When 2 peer OIDs are the same, we just copy the tree 649 * descriptor data. This implicitly borrows the buffer 650 * data from the earlier cell. 651 */ 652for(i =0; i < n; i++, dirmask >>=1) { 653if(i >0&&are_same_oid(&names[i], &names[i -1])) 654 t[i] = t[i -1]; 655else if(i >1&&are_same_oid(&names[i], &names[i -2])) 656 t[i] = t[i -2]; 657else{ 658const unsigned char*sha1 = NULL; 659if(dirmask &1) 660 sha1 = names[i].oid->hash; 661 buf[nr_buf++] =fill_tree_descriptor(t+i, sha1); 662} 663} 664 665 bottom =switch_cache_bottom(&newinfo); 666 ret =traverse_trees(n, t, &newinfo); 667restore_cache_bottom(&newinfo, bottom); 668 669for(i =0; i < nr_buf; i++) 670free(buf[i]); 671 672return ret; 673} 674 675/* 676 * Compare the traverse-path to the cache entry without actually 677 * having to generate the textual representation of the traverse 678 * path. 679 * 680 * NOTE! This *only* compares up to the size of the traverse path 681 * itself - the caller needs to do the final check for the cache 682 * entry having more data at the end! 683 */ 684static intdo_compare_entry_piecewise(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 685{ 686int len, pathlen, ce_len; 687const char*ce_name; 688 689if(info->prev) { 690int cmp =do_compare_entry_piecewise(ce, info->prev, 691&info->name); 692if(cmp) 693return cmp; 694} 695 pathlen = info->pathlen; 696 ce_len =ce_namelen(ce); 697 698/* If ce_len < pathlen then we must have previously hit "name == directory" entry */ 699if(ce_len < pathlen) 700return-1; 701 702 ce_len -= pathlen; 703 ce_name = ce->name + pathlen; 704 705 len =tree_entry_len(n); 706returndf_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 707} 708 709static intdo_compare_entry(const struct cache_entry *ce, 710const struct traverse_info *info, 711const struct name_entry *n) 712{ 713int len, pathlen, ce_len; 714const char*ce_name; 715int cmp; 716 717/* 718 * If we have not precomputed the traverse path, it is quicker 719 * to avoid doing so. But if we have precomputed it, 720 * it is quicker to use the precomputed version. 721 */ 722if(!info->traverse_path) 723returndo_compare_entry_piecewise(ce, info, n); 724 725 cmp =strncmp(ce->name, info->traverse_path, info->pathlen); 726if(cmp) 727return cmp; 728 729 pathlen = info->pathlen; 730 ce_len =ce_namelen(ce); 731 732if(ce_len < pathlen) 733return-1; 734 735 ce_len -= pathlen; 736 ce_name = ce->name + pathlen; 737 738 len =tree_entry_len(n); 739returndf_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); 740} 741 742static intcompare_entry(const struct cache_entry *ce,const struct traverse_info *info,const struct name_entry *n) 743{ 744int cmp =do_compare_entry(ce, info, n); 745if(cmp) 746return cmp; 747 748/* 749 * Even if the beginning compared identically, the ce should 750 * compare as bigger than a directory leading up to it! 751 */ 752returnce_namelen(ce) >traverse_path_len(info, n); 753} 754 755static intce_in_traverse_path(const struct cache_entry *ce, 756const struct traverse_info *info) 757{ 758if(!info->prev) 759return1; 760if(do_compare_entry(ce, info->prev, &info->name)) 761return0; 762/* 763 * If ce (blob) is the same name as the path (which is a tree 764 * we will be descending into), it won't be inside it. 765 */ 766return(info->pathlen <ce_namelen(ce)); 767} 768 769static struct cache_entry *create_ce_entry(const struct traverse_info *info,const struct name_entry *n,int stage) 770{ 771int len =traverse_path_len(info, n); 772struct cache_entry *ce =xcalloc(1,cache_entry_size(len)); 773 774 ce->ce_mode =create_ce_mode(n->mode); 775 ce->ce_flags =create_ce_flags(stage); 776 ce->ce_namelen = len; 777oidcpy(&ce->oid, n->oid); 778make_traverse_path(ce->name, info, n); 779 780return ce; 781} 782 783static intunpack_nondirectories(int n,unsigned long mask, 784unsigned long dirmask, 785struct cache_entry **src, 786const struct name_entry *names, 787const struct traverse_info *info) 788{ 789int i; 790struct unpack_trees_options *o = info->data; 791unsigned long conflicts = info->df_conflicts | dirmask; 792 793/* Do we have *only* directories? Nothing to do */ 794if(mask == dirmask && !src[0]) 795return0; 796 797/* 798 * Ok, we've filled in up to any potential index entry in src[0], 799 * now do the rest. 800 */ 801for(i =0; i < n; i++) { 802int stage; 803unsigned int bit =1ul<< i; 804if(conflicts & bit) { 805 src[i + o->merge] = o->df_conflict_entry; 806continue; 807} 808if(!(mask & bit)) 809continue; 810if(!o->merge) 811 stage =0; 812else if(i +1< o->head_idx) 813 stage =1; 814else if(i +1> o->head_idx) 815 stage =3; 816else 817 stage =2; 818 src[i + o->merge] =create_ce_entry(info, names + i, stage); 819} 820 821if(o->merge) { 822int rc =call_unpack_fn((const struct cache_entry *const*)src, 823 o); 824for(i =0; i < n; i++) { 825struct cache_entry *ce = src[i + o->merge]; 826if(ce != o->df_conflict_entry) 827free(ce); 828} 829return rc; 830} 831 832for(i =0; i < n; i++) 833if(src[i] && src[i] != o->df_conflict_entry) 834if(do_add_entry(o, src[i],0,0)) 835return-1; 836 837return0; 838} 839 840static intunpack_failed(struct unpack_trees_options *o,const char*message) 841{ 842discard_index(&o->result); 843if(!o->gently && !o->exiting_early) { 844if(message) 845returnerror("%s", message); 846return-1; 847} 848return-1; 849} 850 851/* 852 * The tree traversal is looking at name p. If we have a matching entry, 853 * return it. If name p is a directory in the index, do not return 854 * anything, as we will want to match it when the traversal descends into 855 * the directory. 856 */ 857static intfind_cache_pos(struct traverse_info *info, 858const struct name_entry *p) 859{ 860int pos; 861struct unpack_trees_options *o = info->data; 862struct index_state *index = o->src_index; 863int pfxlen = info->pathlen; 864int p_len =tree_entry_len(p); 865 866for(pos = o->cache_bottom; pos < index->cache_nr; pos++) { 867const struct cache_entry *ce = index->cache[pos]; 868const char*ce_name, *ce_slash; 869int cmp, ce_len; 870 871if(ce->ce_flags & CE_UNPACKED) { 872/* 873 * cache_bottom entry is already unpacked, so 874 * we can never match it; don't check it 875 * again. 876 */ 877if(pos == o->cache_bottom) 878++o->cache_bottom; 879continue; 880} 881if(!ce_in_traverse_path(ce, info)) { 882/* 883 * Check if we can skip future cache checks 884 * (because we're already past all possible 885 * entries in the traverse path). 886 */ 887if(info->traverse_path) { 888if(strncmp(ce->name, info->traverse_path, 889 info->pathlen) >0) 890break; 891} 892continue; 893} 894 ce_name = ce->name + pfxlen; 895 ce_slash =strchr(ce_name,'/'); 896if(ce_slash) 897 ce_len = ce_slash - ce_name; 898else 899 ce_len =ce_namelen(ce) - pfxlen; 900 cmp =name_compare(p->path, p_len, ce_name, ce_len); 901/* 902 * Exact match; if we have a directory we need to 903 * delay returning it. 904 */ 905if(!cmp) 906return ce_slash ? -2- pos : pos; 907if(0< cmp) 908continue;/* keep looking */ 909/* 910 * ce_name sorts after p->path; could it be that we 911 * have files under p->path directory in the index? 912 * E.g. ce_name == "t-i", and p->path == "t"; we may 913 * have "t/a" in the index. 914 */ 915if(p_len < ce_len && !memcmp(ce_name, p->path, p_len) && 916 ce_name[p_len] <'/') 917continue;/* keep looking */ 918break; 919} 920return-1; 921} 922 923static struct cache_entry *find_cache_entry(struct traverse_info *info, 924const struct name_entry *p) 925{ 926int pos =find_cache_pos(info, p); 927struct unpack_trees_options *o = info->data; 928 929if(0<= pos) 930return o->src_index->cache[pos]; 931else 932return NULL; 933} 934 935static voiddebug_path(struct traverse_info *info) 936{ 937if(info->prev) { 938debug_path(info->prev); 939if(*info->prev->name.path) 940putchar('/'); 941} 942printf("%s", info->name.path); 943} 944 945static voiddebug_name_entry(int i,struct name_entry *n) 946{ 947printf("ent#%d %06o%s\n", i, 948 n->path ? n->mode :0, 949 n->path ? n->path :"(missing)"); 950} 951 952static voiddebug_unpack_callback(int n, 953unsigned long mask, 954unsigned long dirmask, 955struct name_entry *names, 956struct traverse_info *info) 957{ 958int i; 959printf("* unpack mask%lu, dirmask%lu, cnt%d", 960 mask, dirmask, n); 961debug_path(info); 962putchar('\n'); 963for(i =0; i < n; i++) 964debug_name_entry(i, names + i); 965} 966 967static intunpack_callback(int n,unsigned long mask,unsigned long dirmask,struct name_entry *names,struct traverse_info *info) 968{ 969struct cache_entry *src[MAX_UNPACK_TREES +1] = { NULL, }; 970struct unpack_trees_options *o = info->data; 971const struct name_entry *p = names; 972 973/* Find first entry with a real name (we could use "mask" too) */ 974while(!p->mode) 975 p++; 976 977if(o->debug_unpack) 978debug_unpack_callback(n, mask, dirmask, names, info); 979 980/* Are we supposed to look at the index too? */ 981if(o->merge) { 982while(1) { 983int cmp; 984struct cache_entry *ce; 985 986if(o->diff_index_cached) 987 ce =next_cache_entry(o); 988else 989 ce =find_cache_entry(info, p); 990 991if(!ce) 992break; 993 cmp =compare_entry(ce, info, p); 994if(cmp <0) { 995if(unpack_index_entry(ce, o) <0) 996returnunpack_failed(o, NULL); 997continue; 998} 999if(!cmp) {1000if(ce_stage(ce)) {1001/*1002 * If we skip unmerged index1003 * entries, we'll skip this1004 * entry *and* the tree1005 * entries associated with it!1006 */1007if(o->skip_unmerged) {1008add_same_unmerged(ce, o);1009return mask;1010}1011}1012 src[0] = ce;1013}1014break;1015}1016}10171018if(unpack_nondirectories(n, mask, dirmask, src, names, info) <0)1019return-1;10201021if(o->merge && src[0]) {1022if(ce_stage(src[0]))1023mark_ce_used_same_name(src[0], o);1024else1025mark_ce_used(src[0], o);1026}10271028/* Now handle any directories.. */1029if(dirmask) {1030/* special case: "diff-index --cached" looking at a tree */1031if(o->diff_index_cached &&1032 n ==1&& dirmask ==1&&S_ISDIR(names->mode)) {1033int matches;1034 matches =cache_tree_matches_traversal(o->src_index->cache_tree,1035 names, info);1036/*1037 * Everything under the name matches; skip the1038 * entire hierarchy. diff_index_cached codepath1039 * special cases D/F conflicts in such a way that1040 * it does not do any look-ahead, so this is safe.1041 */1042if(matches) {1043 o->cache_bottom += matches;1044return mask;1045}1046}10471048if(traverse_trees_recursive(n, dirmask, mask & ~dirmask,1049 names, info) <0)1050return-1;1051return mask;1052}10531054return mask;1055}10561057static intclear_ce_flags_1(struct cache_entry **cache,int nr,1058struct strbuf *prefix,1059int select_mask,int clear_mask,1060struct exclude_list *el,int defval);10611062/* Whole directory matching */1063static intclear_ce_flags_dir(struct cache_entry **cache,int nr,1064struct strbuf *prefix,1065char*basename,1066int select_mask,int clear_mask,1067struct exclude_list *el,int defval)1068{1069struct cache_entry **cache_end;1070int dtype = DT_DIR;1071int ret =is_excluded_from_list(prefix->buf, prefix->len,1072 basename, &dtype, el);1073int rc;10741075strbuf_addch(prefix,'/');10761077/* If undecided, use matching result of parent dir in defval */1078if(ret <0)1079 ret = defval;10801081for(cache_end = cache; cache_end != cache + nr; cache_end++) {1082struct cache_entry *ce = *cache_end;1083if(strncmp(ce->name, prefix->buf, prefix->len))1084break;1085}10861087/*1088 * TODO: check el, if there are no patterns that may conflict1089 * with ret (iow, we know in advance the incl/excl1090 * decision for the entire directory), clear flag here without1091 * calling clear_ce_flags_1(). That function will call1092 * the expensive is_excluded_from_list() on every entry.1093 */1094 rc =clear_ce_flags_1(cache, cache_end - cache,1095 prefix,1096 select_mask, clear_mask,1097 el, ret);1098strbuf_setlen(prefix, prefix->len -1);1099return rc;1100}11011102/*1103 * Traverse the index, find every entry that matches according to1104 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the1105 * number of traversed entries.1106 *1107 * If select_mask is non-zero, only entries whose ce_flags has on of1108 * those bits enabled are traversed.1109 *1110 * cache : pointer to an index entry1111 * prefix_len : an offset to its path1112 *1113 * The current path ("prefix") including the trailing '/' is1114 * cache[0]->name[0..(prefix_len-1)]1115 * Top level path has prefix_len zero.1116 */1117static intclear_ce_flags_1(struct cache_entry **cache,int nr,1118struct strbuf *prefix,1119int select_mask,int clear_mask,1120struct exclude_list *el,int defval)1121{1122struct cache_entry **cache_end = cache + nr;11231124/*1125 * Process all entries that have the given prefix and meet1126 * select_mask condition1127 */1128while(cache != cache_end) {1129struct cache_entry *ce = *cache;1130const char*name, *slash;1131int len, dtype, ret;11321133if(select_mask && !(ce->ce_flags & select_mask)) {1134 cache++;1135continue;1136}11371138if(prefix->len &&strncmp(ce->name, prefix->buf, prefix->len))1139break;11401141 name = ce->name + prefix->len;1142 slash =strchr(name,'/');11431144/* If it's a directory, try whole directory match first */1145if(slash) {1146int processed;11471148 len = slash - name;1149strbuf_add(prefix, name, len);11501151 processed =clear_ce_flags_dir(cache, cache_end - cache,1152 prefix,1153 prefix->buf + prefix->len - len,1154 select_mask, clear_mask,1155 el, defval);11561157/* clear_c_f_dir eats a whole dir already? */1158if(processed) {1159 cache += processed;1160strbuf_setlen(prefix, prefix->len - len);1161continue;1162}11631164strbuf_addch(prefix,'/');1165 cache +=clear_ce_flags_1(cache, cache_end - cache,1166 prefix,1167 select_mask, clear_mask, el, defval);1168strbuf_setlen(prefix, prefix->len - len -1);1169continue;1170}11711172/* Non-directory */1173 dtype =ce_to_dtype(ce);1174 ret =is_excluded_from_list(ce->name,ce_namelen(ce),1175 name, &dtype, el);1176if(ret <0)1177 ret = defval;1178if(ret >0)1179 ce->ce_flags &= ~clear_mask;1180 cache++;1181}1182return nr - (cache_end - cache);1183}11841185static intclear_ce_flags(struct cache_entry **cache,int nr,1186int select_mask,int clear_mask,1187struct exclude_list *el)1188{1189static struct strbuf prefix = STRBUF_INIT;11901191strbuf_reset(&prefix);11921193returnclear_ce_flags_1(cache, nr,1194&prefix,1195 select_mask, clear_mask,1196 el,0);1197}11981199/*1200 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout1201 */1202static voidmark_new_skip_worktree(struct exclude_list *el,1203struct index_state *the_index,1204int select_flag,int skip_wt_flag)1205{1206int i;12071208/*1209 * 1. Pretend the narrowest worktree: only unmerged entries1210 * are checked out1211 */1212for(i =0; i < the_index->cache_nr; i++) {1213struct cache_entry *ce = the_index->cache[i];12141215if(select_flag && !(ce->ce_flags & select_flag))1216continue;12171218if(!ce_stage(ce))1219 ce->ce_flags |= skip_wt_flag;1220else1221 ce->ce_flags &= ~skip_wt_flag;1222}12231224/*1225 * 2. Widen worktree according to sparse-checkout file.1226 * Matched entries will have skip_wt_flag cleared (i.e. "in")1227 */1228clear_ce_flags(the_index->cache, the_index->cache_nr,1229 select_flag, skip_wt_flag, el);1230}12311232static intverify_absent(const struct cache_entry *,1233enum unpack_trees_error_types,1234struct unpack_trees_options *);1235/*1236 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the1237 * resulting index, -2 on failure to reflect the changes to the work tree.1238 *1239 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally1240 */1241intunpack_trees(unsigned len,struct tree_desc *t,struct unpack_trees_options *o)1242{1243int i, ret;1244static struct cache_entry *dfc;1245struct exclude_list el;12461247if(len > MAX_UNPACK_TREES)1248die("unpack_trees takes at most%dtrees", MAX_UNPACK_TREES);12491250memset(&el,0,sizeof(el));1251if(!core_apply_sparse_checkout || !o->update)1252 o->skip_sparse_checkout =1;1253if(!o->skip_sparse_checkout) {1254char*sparse =git_pathdup("info/sparse-checkout");1255if(add_excludes_from_file_to_list(sparse,"",0, &el,0) <0)1256 o->skip_sparse_checkout =1;1257else1258 o->el = ⪙1259free(sparse);1260}12611262memset(&o->result,0,sizeof(o->result));1263 o->result.initialized =1;1264 o->result.timestamp.sec = o->src_index->timestamp.sec;1265 o->result.timestamp.nsec = o->src_index->timestamp.nsec;1266 o->result.version = o->src_index->version;1267 o->result.split_index = o->src_index->split_index;1268if(o->result.split_index)1269 o->result.split_index->refcount++;1270hashcpy(o->result.sha1, o->src_index->sha1);1271 o->merge_size = len;1272mark_all_ce_unused(o->src_index);12731274/*1275 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries1276 */1277if(!o->skip_sparse_checkout)1278mark_new_skip_worktree(o->el, o->src_index,0, CE_NEW_SKIP_WORKTREE);12791280if(!dfc)1281 dfc =xcalloc(1,cache_entry_size(0));1282 o->df_conflict_entry = dfc;12831284if(len) {1285const char*prefix = o->prefix ? o->prefix :"";1286struct traverse_info info;12871288setup_traverse_info(&info, prefix);1289 info.fn = unpack_callback;1290 info.data = o;1291 info.show_all_errors = o->show_all_errors;1292 info.pathspec = o->pathspec;12931294if(o->prefix) {1295/*1296 * Unpack existing index entries that sort before the1297 * prefix the tree is spliced into. Note that o->merge1298 * is always true in this case.1299 */1300while(1) {1301struct cache_entry *ce =next_cache_entry(o);1302if(!ce)1303break;1304if(ce_in_traverse_path(ce, &info))1305break;1306if(unpack_index_entry(ce, o) <0)1307goto return_failed;1308}1309}13101311if(traverse_trees(len, t, &info) <0)1312goto return_failed;1313}13141315/* Any left-over entries in the index? */1316if(o->merge) {1317while(1) {1318struct cache_entry *ce =next_cache_entry(o);1319if(!ce)1320break;1321if(unpack_index_entry(ce, o) <0)1322goto return_failed;1323}1324}1325mark_all_ce_unused(o->src_index);13261327if(o->trivial_merges_only && o->nontrivial_merge) {1328 ret =unpack_failed(o,"Merge requires file-level merging");1329goto done;1330}13311332if(!o->skip_sparse_checkout) {1333int empty_worktree =1;13341335/*1336 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #11337 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE1338 * so apply_sparse_checkout() won't attempt to remove it from worktree1339 */1340mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);13411342 ret =0;1343for(i =0; i < o->result.cache_nr; i++) {1344struct cache_entry *ce = o->result.cache[i];13451346/*1347 * Entries marked with CE_ADDED in merged_entry() do not have1348 * verify_absent() check (the check is effectively disabled1349 * because CE_NEW_SKIP_WORKTREE is set unconditionally).1350 *1351 * Do the real check now because we have had1352 * correct CE_NEW_SKIP_WORKTREE1353 */1354if(ce->ce_flags & CE_ADDED &&1355verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1356if(!o->show_all_errors)1357goto return_failed;1358 ret = -1;1359}13601361if(apply_sparse_checkout(&o->result, ce, o)) {1362if(!o->show_all_errors)1363goto return_failed;1364 ret = -1;1365}1366if(!ce_skip_worktree(ce))1367 empty_worktree =0;13681369}1370if(ret <0)1371goto return_failed;1372/*1373 * Sparse checkout is meant to narrow down checkout area1374 * but it does not make sense to narrow down to empty working1375 * tree. This is usually a mistake in sparse checkout rules.1376 * Do not allow users to do that.1377 */1378if(o->result.cache_nr && empty_worktree) {1379 ret =unpack_failed(o,"Sparse checkout leaves no entry on working directory");1380goto done;1381}1382}13831384 o->src_index = NULL;1385 ret =check_updates(o) ? (-2) :0;1386if(o->dst_index) {1387if(!ret) {1388if(!o->result.cache_tree)1389 o->result.cache_tree =cache_tree();1390if(!cache_tree_fully_valid(o->result.cache_tree))1391cache_tree_update(&o->result,1392 WRITE_TREE_SILENT |1393 WRITE_TREE_REPAIR);1394}1395discard_index(o->dst_index);1396*o->dst_index = o->result;1397}else{1398discard_index(&o->result);1399}14001401done:1402clear_exclude_list(&el);1403return ret;14041405return_failed:1406if(o->show_all_errors)1407display_error_msgs(o);1408mark_all_ce_unused(o->src_index);1409 ret =unpack_failed(o, NULL);1410if(o->exiting_early)1411 ret =0;1412goto done;1413}14141415/* Here come the merge functions */14161417static intreject_merge(const struct cache_entry *ce,1418struct unpack_trees_options *o)1419{1420return o->gently ? -1:1421add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);1422}14231424static intsame(const struct cache_entry *a,const struct cache_entry *b)1425{1426if(!!a != !!b)1427return0;1428if(!a && !b)1429return1;1430if((a->ce_flags | b->ce_flags) & CE_CONFLICTED)1431return0;1432return a->ce_mode == b->ce_mode &&1433!oidcmp(&a->oid, &b->oid);1434}143514361437/*1438 * When a CE gets turned into an unmerged entry, we1439 * want it to be up-to-date1440 */1441static intverify_uptodate_1(const struct cache_entry *ce,1442struct unpack_trees_options *o,1443enum unpack_trees_error_types error_type)1444{1445struct stat st;14461447if(o->index_only)1448return0;14491450/*1451 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again1452 * if this entry is truly up-to-date because this file may be1453 * overwritten.1454 */1455if((ce->ce_flags & CE_VALID) ||ce_skip_worktree(ce))1456;/* keep checking */1457else if(o->reset ||ce_uptodate(ce))1458return0;14591460if(!lstat(ce->name, &st)) {1461int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;1462unsigned changed =ie_match_stat(o->src_index, ce, &st, flags);14631464if(submodule_from_ce(ce)) {1465int r =check_submodule_move_head(ce,1466"HEAD",oid_to_hex(&ce->oid), o);1467if(r)1468return o->gently ? -1:1469add_rejected_path(o, error_type, ce->name);1470return0;1471}14721473if(!changed)1474return0;1475/*1476 * Historic default policy was to allow submodule to be out1477 * of sync wrt the superproject index. If the submodule was1478 * not considered interesting above, we don't care here.1479 */1480if(S_ISGITLINK(ce->ce_mode))1481return0;14821483 errno =0;1484}1485if(errno == ENOENT)1486return0;1487return o->gently ? -1:1488add_rejected_path(o, error_type, ce->name);1489}14901491static intverify_uptodate(const struct cache_entry *ce,1492struct unpack_trees_options *o)1493{1494if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1495return0;1496returnverify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);1497}14981499static intverify_uptodate_sparse(const struct cache_entry *ce,1500struct unpack_trees_options *o)1501{1502returnverify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);1503}15041505static voidinvalidate_ce_path(const struct cache_entry *ce,1506struct unpack_trees_options *o)1507{1508if(!ce)1509return;1510cache_tree_invalidate_path(o->src_index, ce->name);1511untracked_cache_invalidate_path(o->src_index, ce->name);1512}15131514/*1515 * Check that checking out ce->sha1 in subdir ce->name is not1516 * going to overwrite any working files.1517 *1518 * Currently, git does not checkout subprojects during a superproject1519 * checkout, so it is not going to overwrite anything.1520 */1521static intverify_clean_submodule(const char*old_sha1,1522const struct cache_entry *ce,1523enum unpack_trees_error_types error_type,1524struct unpack_trees_options *o)1525{1526if(!submodule_from_ce(ce))1527return0;15281529returncheck_submodule_move_head(ce, old_sha1,1530oid_to_hex(&ce->oid), o);1531}15321533static intverify_clean_subdirectory(const struct cache_entry *ce,1534enum unpack_trees_error_types error_type,1535struct unpack_trees_options *o)1536{1537/*1538 * we are about to extract "ce->name"; we would not want to lose1539 * anything in the existing directory there.1540 */1541int namelen;1542int i;1543struct dir_struct d;1544char*pathbuf;1545int cnt =0;15461547if(S_ISGITLINK(ce->ce_mode)) {1548unsigned char sha1[20];1549int sub_head =resolve_gitlink_ref(ce->name,"HEAD", sha1);1550/*1551 * If we are not going to update the submodule, then1552 * we don't care.1553 */1554if(!sub_head && !hashcmp(sha1, ce->oid.hash))1555return0;1556returnverify_clean_submodule(sub_head ? NULL :sha1_to_hex(sha1),1557 ce, error_type, o);1558}15591560/*1561 * First let's make sure we do not have a local modification1562 * in that directory.1563 */1564 namelen =ce_namelen(ce);1565for(i =locate_in_src_index(ce, o);1566 i < o->src_index->cache_nr;1567 i++) {1568struct cache_entry *ce2 = o->src_index->cache[i];1569int len =ce_namelen(ce2);1570if(len < namelen ||1571strncmp(ce->name, ce2->name, namelen) ||1572 ce2->name[namelen] !='/')1573break;1574/*1575 * ce2->name is an entry in the subdirectory to be1576 * removed.1577 */1578if(!ce_stage(ce2)) {1579if(verify_uptodate(ce2, o))1580return-1;1581add_entry(o, ce2, CE_REMOVE,0);1582mark_ce_used(ce2, o);1583}1584 cnt++;1585}15861587/*1588 * Then we need to make sure that we do not lose a locally1589 * present file that is not ignored.1590 */1591 pathbuf =xstrfmt("%.*s/", namelen, ce->name);15921593memset(&d,0,sizeof(d));1594if(o->dir)1595 d.exclude_per_dir = o->dir->exclude_per_dir;1596 i =read_directory(&d, pathbuf, namelen+1, NULL);1597if(i)1598return o->gently ? -1:1599add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);1600free(pathbuf);1601return cnt;1602}16031604/*1605 * This gets called when there was no index entry for the tree entry 'dst',1606 * but we found a file in the working tree that 'lstat()' said was fine,1607 * and we're on a case-insensitive filesystem.1608 *1609 * See if we can find a case-insensitive match in the index that also1610 * matches the stat information, and assume it's that other file!1611 */1612static inticase_exists(struct unpack_trees_options *o,const char*name,int len,struct stat *st)1613{1614const struct cache_entry *src;16151616 src =index_file_exists(o->src_index, name, len,1);1617return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);1618}16191620static intcheck_ok_to_remove(const char*name,int len,int dtype,1621const struct cache_entry *ce,struct stat *st,1622enum unpack_trees_error_types error_type,1623struct unpack_trees_options *o)1624{1625const struct cache_entry *result;16261627/*1628 * It may be that the 'lstat()' succeeded even though1629 * target 'ce' was absent, because there is an old1630 * entry that is different only in case..1631 *1632 * Ignore that lstat() if it matches.1633 */1634if(ignore_case &&icase_exists(o, name, len, st))1635return0;16361637if(o->dir &&1638is_excluded(o->dir, name, &dtype))1639/*1640 * ce->name is explicitly excluded, so it is Ok to1641 * overwrite it.1642 */1643return0;1644if(S_ISDIR(st->st_mode)) {1645/*1646 * We are checking out path "foo" and1647 * found "foo/." in the working tree.1648 * This is tricky -- if we have modified1649 * files that are in "foo/" we would lose1650 * them.1651 */1652if(verify_clean_subdirectory(ce, error_type, o) <0)1653return-1;1654return0;1655}16561657/*1658 * The previous round may already have decided to1659 * delete this path, which is in a subdirectory that1660 * is being replaced with a blob.1661 */1662 result =index_file_exists(&o->result, name, len,0);1663if(result) {1664if(result->ce_flags & CE_REMOVE)1665return0;1666}16671668return o->gently ? -1:1669add_rejected_path(o, error_type, name);1670}16711672/*1673 * We do not want to remove or overwrite a working tree file that1674 * is not tracked, unless it is ignored.1675 */1676static intverify_absent_1(const struct cache_entry *ce,1677enum unpack_trees_error_types error_type,1678struct unpack_trees_options *o)1679{1680int len;1681struct stat st;16821683if(o->index_only || o->reset || !o->update)1684return0;16851686 len =check_leading_path(ce->name,ce_namelen(ce));1687if(!len)1688return0;1689else if(len >0) {1690char*path;1691int ret;16921693 path =xmemdupz(ce->name, len);1694if(lstat(path, &st))1695 ret =error_errno("cannot stat '%s'", path);1696else{1697if(submodule_from_ce(ce))1698 ret =check_submodule_move_head(ce,1699oid_to_hex(&ce->oid),1700 NULL, o);1701else1702 ret =check_ok_to_remove(path, len, DT_UNKNOWN, NULL,1703&st, error_type, o);1704}1705free(path);1706return ret;1707}else if(lstat(ce->name, &st)) {1708if(errno != ENOENT)1709returnerror_errno("cannot stat '%s'", ce->name);1710return0;1711}else{1712if(submodule_from_ce(ce))1713returncheck_submodule_move_head(ce,oid_to_hex(&ce->oid),1714 NULL, o);17151716returncheck_ok_to_remove(ce->name,ce_namelen(ce),1717ce_to_dtype(ce), ce, &st,1718 error_type, o);1719}1720}17211722static intverify_absent(const struct cache_entry *ce,1723enum unpack_trees_error_types error_type,1724struct unpack_trees_options *o)1725{1726if(!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))1727return0;1728returnverify_absent_1(ce, error_type, o);1729}17301731static intverify_absent_sparse(const struct cache_entry *ce,1732enum unpack_trees_error_types error_type,1733struct unpack_trees_options *o)1734{1735enum unpack_trees_error_types orphaned_error = error_type;1736if(orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)1737 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;17381739returnverify_absent_1(ce, orphaned_error, o);1740}17411742static intmerged_entry(const struct cache_entry *ce,1743const struct cache_entry *old,1744struct unpack_trees_options *o)1745{1746int update = CE_UPDATE;1747struct cache_entry *merge =dup_entry(ce);17481749if(!old) {1750/*1751 * New index entries. In sparse checkout, the following1752 * verify_absent() will be delayed until after1753 * traverse_trees() finishes in unpack_trees(), then:1754 *1755 * - CE_NEW_SKIP_WORKTREE will be computed correctly1756 * - verify_absent() be called again, this time with1757 * correct CE_NEW_SKIP_WORKTREE1758 *1759 * verify_absent() call here does nothing in sparse1760 * checkout (i.e. o->skip_sparse_checkout == 0)1761 */1762 update |= CE_ADDED;1763 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;17641765if(verify_absent(merge,1766 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {1767free(merge);1768return-1;1769}1770invalidate_ce_path(merge, o);17711772if(submodule_from_ce(ce)) {1773int ret =check_submodule_move_head(ce, NULL,1774oid_to_hex(&ce->oid),1775 o);1776if(ret)1777return ret;1778}17791780}else if(!(old->ce_flags & CE_CONFLICTED)) {1781/*1782 * See if we can re-use the old CE directly?1783 * That way we get the uptodate stat info.1784 *1785 * This also removes the UPDATE flag on a match; otherwise1786 * we will end up overwriting local changes in the work tree.1787 */1788if(same(old, merge)) {1789copy_cache_entry(merge, old);1790 update =0;1791}else{1792if(verify_uptodate(old, o)) {1793free(merge);1794return-1;1795}1796/* Migrate old flags over */1797 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);1798invalidate_ce_path(old, o);1799}18001801if(submodule_from_ce(ce)) {1802int ret =check_submodule_move_head(ce,oid_to_hex(&old->oid),1803oid_to_hex(&ce->oid),1804 o);1805if(ret)1806return ret;1807}1808}else{1809/*1810 * Previously unmerged entry left as an existence1811 * marker by read_index_unmerged();1812 */1813invalidate_ce_path(old, o);1814}18151816do_add_entry(o, merge, update, CE_STAGEMASK);1817return1;1818}18191820static intdeleted_entry(const struct cache_entry *ce,1821const struct cache_entry *old,1822struct unpack_trees_options *o)1823{1824/* Did it exist in the index? */1825if(!old) {1826if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))1827return-1;1828return0;1829}1830if(!(old->ce_flags & CE_CONFLICTED) &&verify_uptodate(old, o))1831return-1;1832add_entry(o, ce, CE_REMOVE,0);1833invalidate_ce_path(ce, o);1834return1;1835}18361837static intkeep_entry(const struct cache_entry *ce,1838struct unpack_trees_options *o)1839{1840add_entry(o, ce,0,0);1841return1;1842}18431844#if DBRT_DEBUG1845static voidshow_stage_entry(FILE*o,1846const char*label,const struct cache_entry *ce)1847{1848if(!ce)1849fprintf(o,"%s(missing)\n", label);1850else1851fprintf(o,"%s%06o%s %d\t%s\n",1852 label,1853 ce->ce_mode,1854oid_to_hex(&ce->oid),1855ce_stage(ce),1856 ce->name);1857}1858#endif18591860intthreeway_merge(const struct cache_entry *const*stages,1861struct unpack_trees_options *o)1862{1863const struct cache_entry *index;1864const struct cache_entry *head;1865const struct cache_entry *remote = stages[o->head_idx +1];1866int count;1867int head_match =0;1868int remote_match =0;18691870int df_conflict_head =0;1871int df_conflict_remote =0;18721873int any_anc_missing =0;1874int no_anc_exists =1;1875int i;18761877for(i =1; i < o->head_idx; i++) {1878if(!stages[i] || stages[i] == o->df_conflict_entry)1879 any_anc_missing =1;1880else1881 no_anc_exists =0;1882}18831884 index = stages[0];1885 head = stages[o->head_idx];18861887if(head == o->df_conflict_entry) {1888 df_conflict_head =1;1889 head = NULL;1890}18911892if(remote == o->df_conflict_entry) {1893 df_conflict_remote =1;1894 remote = NULL;1895}18961897/*1898 * First, if there's a #16 situation, note that to prevent #131899 * and #14.1900 */1901if(!same(remote, head)) {1902for(i =1; i < o->head_idx; i++) {1903if(same(stages[i], head)) {1904 head_match = i;1905}1906if(same(stages[i], remote)) {1907 remote_match = i;1908}1909}1910}19111912/*1913 * We start with cases where the index is allowed to match1914 * something other than the head: #14(ALT) and #2ALT, where it1915 * is permitted to match the result instead.1916 */1917/* #14, #14ALT, #2ALT */1918if(remote && !df_conflict_head && head_match && !remote_match) {1919if(index && !same(index, remote) && !same(index, head))1920returnreject_merge(index, o);1921returnmerged_entry(remote, index, o);1922}1923/*1924 * If we have an entry in the index cache, then we want to1925 * make sure that it matches head.1926 */1927if(index && !same(index, head))1928returnreject_merge(index, o);19291930if(head) {1931/* #5ALT, #15 */1932if(same(head, remote))1933returnmerged_entry(head, index, o);1934/* #13, #3ALT */1935if(!df_conflict_remote && remote_match && !head_match)1936returnmerged_entry(head, index, o);1937}19381939/* #1 */1940if(!head && !remote && any_anc_missing)1941return0;19421943/*1944 * Under the "aggressive" rule, we resolve mostly trivial1945 * cases that we historically had git-merge-one-file resolve.1946 */1947if(o->aggressive) {1948int head_deleted = !head;1949int remote_deleted = !remote;1950const struct cache_entry *ce = NULL;19511952if(index)1953 ce = index;1954else if(head)1955 ce = head;1956else if(remote)1957 ce = remote;1958else{1959for(i =1; i < o->head_idx; i++) {1960if(stages[i] && stages[i] != o->df_conflict_entry) {1961 ce = stages[i];1962break;1963}1964}1965}19661967/*1968 * Deleted in both.1969 * Deleted in one and unchanged in the other.1970 */1971if((head_deleted && remote_deleted) ||1972(head_deleted && remote && remote_match) ||1973(remote_deleted && head && head_match)) {1974if(index)1975returndeleted_entry(index, index, o);1976if(ce && !head_deleted) {1977if(verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))1978return-1;1979}1980return0;1981}1982/*1983 * Added in both, identically.1984 */1985if(no_anc_exists && head && remote &&same(head, remote))1986returnmerged_entry(head, index, o);19871988}19891990/* Below are "no merge" cases, which require that the index be1991 * up-to-date to avoid the files getting overwritten with1992 * conflict resolution files.1993 */1994if(index) {1995if(verify_uptodate(index, o))1996return-1;1997}19981999 o->nontrivial_merge =1;20002001/* #2, #3, #4, #6, #7, #9, #10, #11. */2002 count =0;2003if(!head_match || !remote_match) {2004for(i =1; i < o->head_idx; i++) {2005if(stages[i] && stages[i] != o->df_conflict_entry) {2006keep_entry(stages[i], o);2007 count++;2008break;2009}2010}2011}2012#if DBRT_DEBUG2013else{2014fprintf(stderr,"read-tree: warning #16 detected\n");2015show_stage_entry(stderr,"head ", stages[head_match]);2016show_stage_entry(stderr,"remote ", stages[remote_match]);2017}2018#endif2019if(head) { count +=keep_entry(head, o); }2020if(remote) { count +=keep_entry(remote, o); }2021return count;2022}20232024/*2025 * Two-way merge.2026 *2027 * The rule is to "carry forward" what is in the index without losing2028 * information across a "fast-forward", favoring a successful merge2029 * over a merge failure when it makes sense. For details of the2030 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.2031 *2032 */2033inttwoway_merge(const struct cache_entry *const*src,2034struct unpack_trees_options *o)2035{2036const struct cache_entry *current = src[0];2037const struct cache_entry *oldtree = src[1];2038const struct cache_entry *newtree = src[2];20392040if(o->merge_size !=2)2041returnerror("Cannot do a twoway merge of%dtrees",2042 o->merge_size);20432044if(oldtree == o->df_conflict_entry)2045 oldtree = NULL;2046if(newtree == o->df_conflict_entry)2047 newtree = NULL;20482049if(current) {2050if(current->ce_flags & CE_CONFLICTED) {2051if(same(oldtree, newtree) || o->reset) {2052if(!newtree)2053returndeleted_entry(current, current, o);2054else2055returnmerged_entry(newtree, current, o);2056}2057returnreject_merge(current, o);2058}else if((!oldtree && !newtree) ||/* 4 and 5 */2059(!oldtree && newtree &&2060same(current, newtree)) ||/* 6 and 7 */2061(oldtree && newtree &&2062same(oldtree, newtree)) ||/* 14 and 15 */2063(oldtree && newtree &&2064!same(oldtree, newtree) &&/* 18 and 19 */2065same(current, newtree))) {2066returnkeep_entry(current, o);2067}else if(oldtree && !newtree &&same(current, oldtree)) {2068/* 10 or 11 */2069returndeleted_entry(oldtree, current, o);2070}else if(oldtree && newtree &&2071same(current, oldtree) && !same(current, newtree)) {2072/* 20 or 21 */2073returnmerged_entry(newtree, current, o);2074}else2075returnreject_merge(current, o);2076}2077else if(newtree) {2078if(oldtree && !o->initial_checkout) {2079/*2080 * deletion of the path was staged;2081 */2082if(same(oldtree, newtree))2083return1;2084returnreject_merge(oldtree, o);2085}2086returnmerged_entry(newtree, current, o);2087}2088returndeleted_entry(oldtree, current, o);2089}20902091/*2092 * Bind merge.2093 *2094 * Keep the index entries at stage0, collapse stage1 but make sure2095 * stage0 does not have anything there.2096 */2097intbind_merge(const struct cache_entry *const*src,2098struct unpack_trees_options *o)2099{2100const struct cache_entry *old = src[0];2101const struct cache_entry *a = src[1];21022103if(o->merge_size !=1)2104returnerror("Cannot do a bind merge of%dtrees",2105 o->merge_size);2106if(a && old)2107return o->gently ? -1:2108error(ERRORMSG(o, ERROR_BIND_OVERLAP),2109super_prefixed(a->name),2110super_prefixed(old->name));2111if(!a)2112returnkeep_entry(old, o);2113else2114returnmerged_entry(a, NULL, o);2115}21162117/*2118 * One-way merge.2119 *2120 * The rule is:2121 * - take the stat information from stage0, take the data from stage12122 */2123intoneway_merge(const struct cache_entry *const*src,2124struct unpack_trees_options *o)2125{2126const struct cache_entry *old = src[0];2127const struct cache_entry *a = src[1];21282129if(o->merge_size !=1)2130returnerror("Cannot do a oneway merge of%dtrees",2131 o->merge_size);21322133if(!a || a == o->df_conflict_entry)2134returndeleted_entry(old, old, o);21352136if(old &&same(old, a)) {2137int update =0;2138if(o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {2139struct stat st;2140if(lstat(old->name, &st) ||2141ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))2142 update |= CE_UPDATE;2143}2144add_entry(o, old, update,0);2145return0;2146}2147returnmerged_entry(a, old, o);2148}